e2fsprog und util-linux aufeinander angepasst. neuere Version bon libblkid und libuuid sind in util-linux. von daher darf e2fsprog diese nicht mehr bauen

git-svn-id: svn://svn.compuextreme.de/Viitor/V962/ViitorMake@5429 504e572c-2e33-0410-9681-be2bf7408885
This commit is contained in:
kueller 2010-03-02 15:33:11 +00:00
parent 2e72ec3456
commit 5df956c14f
2 changed files with 19 additions and 6 deletions

View File

@ -78,12 +78,13 @@ premk() {
}
mk32() {
gcc="gcc ${BUILDOPTIONS32}" \
CC="gcc ${BUILDOPTIONS32}" \
LDFLAGS="-luuid -lblkid" \
../e2fsprogs*/configure --prefix=/usr \
--with-root-prefix="" \
--enable-elf-shlibs \
--disable-libblkid
--disable-libblkid \
--disable-libuuid
make -j $NUMCPU
make -j $NUMCPU install
make -j $NUMCPU DESTDIR=$TMPROOT install
@ -105,13 +106,14 @@ mk() {
sed -i '/libdir=.*\/lib/s@/lib@/lib64@g' configure
fi
cd -
gcc="gcc ${BUILDOPTIONS}" \
CC="gcc ${BUILDOPTIONS}" \
LDFLAGS="-luuid -lblkid" \
../e2fsprogs*/configure --prefix=/usr \
--libdir=/$LIBDIR \
--with-root-prefix="" \
--enable-elf-shlibs \
--disable-libblkid
--disable-libblkid \
--disable-libuuid
make -j $NUMCPU
make -j $NUMCPU install
make -j $NUMCPU DESTDIR=$TMPROOT install

View File

@ -72,6 +72,18 @@ premk() {
sed -i 's%etc/adjtime%var/lib/hwclock/adjtime%' hwclock/hwclock.c
}
mk32() {
CC="gcc ${BUILDOPTIONS32} -L/lib64 -L/usr/lib64" \
./configure --enable-partx \
--disable-wall \
--enable-write
make -j $NUMCPU
make -j $NUMCPU DESTDIR=$TMPROOT install
make distclean
echo "Make Ready"
read
}
mk() {
if [ ${MK64BIT} == "true" ]; then
ADDOPTIONS="--libdir=\${prefix}/lib64"
@ -80,8 +92,7 @@ mk() {
./configure $ADDOPTIONS \
--enable-partx \
--disable-wall \
--enable-write \
--with-fsprobe=builtin
--enable-write
make -j $NUMCPU
make -j $NUMCPU DESTDIR=$TMPROOT install
cd sys-utils