diff --git a/BaseBuild/Basesys/util-linux-ng b/BaseBuild/Basesys/util-linux-ng index 8c00483..a897ba1 100644 --- a/BaseBuild/Basesys/util-linux-ng +++ b/BaseBuild/Basesys/util-linux-ng @@ -69,27 +69,27 @@ SRCPATH=Base/System premk() { - sed -e "s/^HAVE_SLN=no/HAVE_SLN=yes/" MCONFIG| \ - sed -e "s/^HAVE_TSORT=no/HAVE_TSORT=yes/"| \ - sed -e "s/^HAVE_PAM=no/HAVE_PAM=yes/"| \ - sed -e "s/^# ADD_RAW=yes/ADD_RAW=yes/"| - sed -e "s%USRGAMES_DIR= /usr/gamesr%USRGAMES_DIR= /usr/bin%"| - sed -e "s/-O2 -m486/$CFLAGS/" >MCONFIG2 - mv MCONFIG2 MCONFIG sed 's%etc/adjtime%var/lib/hwclock/adjtime%' hwclock/hwclock.c >/tmp/hwclock.c mv /tmp/hwclock.c hwclock/hwclock.c - sed -e 's%#include %//#include %' sys-utils/cytune.c >/tmp/cytune.c - mv /tmp/cytune.c sys-utils/cytune.c + #sed -e 's%#include %//#include %' sys-utils/cytune.c >/tmp/cytune.c + #mv /tmp/cytune.c sys-utils/cytune.c } mk() { + if [ ${MK64BIT} == "true" ]; then + ADDOPTIONS="--libdir=\${prefix}/lib64" + fi CC="gcc ${BUILDOPTIONS}" \ - ./configure --host=$TARGET + ./configure --host=$TARGET \ + $ADDOPTIONS \ + --enable-partx \ + --disable-wall \ + --enable-write make -j $NUMCPU make -j $NUMCPU DESTDIR=$TMPROOT install cd sys-utils make rdev - make ARCH=intel DESTDIR=$TMPROOT install + cp rdev $TMPROOT/usr/sbin cd - }