Browse Source

e2fsprogs: enhanced to not conflict with util-linux-ng if installed

user/chris/old/ruby
Alejandro Mery 15 years ago
committed by Alejandro Mery
parent
commit
e13315e8c3
1 changed files with 8 additions and 3 deletions
  1. +8
    -3
      filesystem/e2fsprogs/e2fsprogs.conf

+ 8
- 3
filesystem/e2fsprogs/e2fsprogs.conf

@ -2,7 +2,7 @@
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../e2fsprogs/e2fsprogs.conf
# Copyright (C) 2008 The OpenSDE Project
# Copyright (C) 2008 - 2009 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2004 Clifford Wolf
#
@ -28,10 +28,15 @@ fix_pkgconfig_dir() {
if [ "$SDECFG_DIETLIBC_e2fsprogs" == "1" ] ; then
confopt="$confopt --with-diet-libc"
[ "$dietlibc_dynamic_static" = "dynamic" ] &&
var_append confoptx " " "--enable-dynamic-e2fsck"
var_append confopt " " "--enable-dynamic-e2fsck"
fi
var_append confopt ' ' '--enable-fsck'
if pkginstalled util-linux-ng; then
# do not build stuff now provided by util-linux-ng
for x in libuuid uuidd libblkid fsck; do
var_append extraconfopt ' ' "--disable-$x"
done
fi
if [ "$SDECFG_STATIC" = "0" ]; then
if atstage native || [ "$crossnative" == "cross" ] ; then

Loading…
Cancel
Save