From 5df956c14f279c23edc4b5930335409f07bc356b Mon Sep 17 00:00:00 2001
From: kueller <kueller@504e572c-2e33-0410-9681-be2bf7408885>
Date: Tue, 2 Mar 2010 15:33:11 +0000
Subject: [PATCH] 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
---
 BaseBuild/Basesys/e2fsprogs     | 10 ++++++----
 BaseBuild/Basesys/util-linux-ng | 15 +++++++++++++--
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/BaseBuild/Basesys/e2fsprogs b/BaseBuild/Basesys/e2fsprogs
index e8b6511..aa2a2ad 100644
--- a/BaseBuild/Basesys/e2fsprogs
+++ b/BaseBuild/Basesys/e2fsprogs
@@ -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 
diff --git a/BaseBuild/Basesys/util-linux-ng b/BaseBuild/Basesys/util-linux-ng
index 2662fd5..0321074 100644
--- a/BaseBuild/Basesys/util-linux-ng
+++ b/BaseBuild/Basesys/util-linux-ng
@@ -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