From 405417f329a2c4549e7819042600f6001382516b Mon Sep 17 00:00:00 2001
From: kueller <kueller@504e572c-2e33-0410-9681-be2bf7408885>
Date: Tue, 2 Mar 2010 09:56:25 +0000
Subject: [PATCH] =?UTF-8?q?Update=20f=C3=BCr=20util-linux=20und=20e2fsprog?=
 =?UTF-8?q?s.=20util-linux=20bringt=20das=20moderner=20blkid=20mit=20-=20h?=
 =?UTF-8?q?ier=20ist=20noch=20eine=20Umstellung=20im=20dmk=20file=20notwen?=
 =?UTF-8?q?dig,=20da=20util-linux=20jetzt=20for=20e2fsprogs=20gebaut=20wer?=
 =?UTF-8?q?den=20muss?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: svn://svn.compuextreme.de/Viitor/V962/ViitorMake@5422 504e572c-2e33-0410-9681-be2bf7408885
---
 BaseBuild/Basesys/Basesys.dmk   |  2 +-
 BaseBuild/Basesys/e2fsprogs     | 16 +++++++++++++---
 BaseBuild/Basesys/util-linux-ng |  3 ++-
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/BaseBuild/Basesys/Basesys.dmk b/BaseBuild/Basesys/Basesys.dmk
index 8e3e489..425ced0 100644
--- a/BaseBuild/Basesys/Basesys.dmk
+++ b/BaseBuild/Basesys/Basesys.dmk
@@ -51,6 +51,7 @@
 16	Basesys/multiarch_wrapper
 16	Basesys/sed
 16	Basesys/binutils
+16	Basesys/pkgconfig
 16	Basesys/e2fsprogs
 16	Basesys/coreutils
 16	Basesys/m4
@@ -90,7 +91,6 @@
 16	Basesys/psmisc
 16	Basesys/shadow
 16	Basesys/sysklogd
-16	Basesys/pkgconfig
 16	Basesys/expat
 16	Basesys/libxml2
 16	Basesys/dbus
diff --git a/BaseBuild/Basesys/e2fsprogs b/BaseBuild/Basesys/e2fsprogs
index 7568584..e8b6511 100644
--- a/BaseBuild/Basesys/e2fsprogs
+++ b/BaseBuild/Basesys/e2fsprogs
@@ -78,16 +78,21 @@ premk() {
 }
 
 mk32() {
+	gcc="gcc ${BUILDOPTIONS32}" \
 	CC="gcc ${BUILDOPTIONS32}" \
 	../e2fsprogs*/configure --prefix=/usr \
 				--with-root-prefix="" \
-				--enable-elf-shlibs \
-				--with-cc="gcc ${BUILDOPTIONS32}"
+				--enable-elf-shlibs  \
+				--disable-libblkid
 	make -j $NUMCPU
 	make -j $NUMCPU install
 	make -j $NUMCPU DESTDIR=$TMPROOT install
 	make -j $NUMCPU install-libs
 	make -j $NUMCPU DESTDIR=$TMPROOT install-libs
+	if [ ! -d $TMPROOT/usr/lib ]; then
+		mkdir -p $TMPROOT/usr/lib
+	fi
+	mv $TMPROOT/lib/pkgconfig $TMPROOT/usr/lib
 	cd ../e2fsprogs*
 	rm -r ../build-e2fsprogs
 	mkdir ../build-e2fsprogs
@@ -101,11 +106,12 @@ mk() {
 	fi
 	cd -
 	gcc="gcc ${BUILDOPTIONS}" \
+	CC="gcc ${BUILDOPTIONS}" \
 	../e2fsprogs*/configure --prefix=/usr \
 				--libdir=/$LIBDIR \
 				--with-root-prefix="" \
 				--enable-elf-shlibs \
-				--with-cc="gcc ${BUILDOPTIONS}"
+				--disable-libblkid
 	make -j $NUMCPU 
 	make -j $NUMCPU install
 	make -j $NUMCPU DESTDIR=$TMPROOT install 
@@ -113,6 +119,10 @@ mk() {
 	install-info $TMPROOT/usr/share/info/libext2fs.info \
 	             $TMPROOT/usr/share/info/dir
 	rm $TMPROOT/usr/info
+	if [ ! -d $TMPROOT/usr/$LIBDIR ]; then
+		mkdir -p $TMPROOT/usr/$LIBDIR
+	fi
+	mv $TMPROOT/$LIBDIR/pkgconfig $TMPROOT/usr/$LIBDIR
 }
 
 postmk() {
diff --git a/BaseBuild/Basesys/util-linux-ng b/BaseBuild/Basesys/util-linux-ng
index 5fc26e9..2662fd5 100644
--- a/BaseBuild/Basesys/util-linux-ng
+++ b/BaseBuild/Basesys/util-linux-ng
@@ -80,7 +80,8 @@ mk() {
 	./configure $ADDOPTIONS \
 		    --enable-partx \
 		    --disable-wall \
-		    --enable-write
+		    --enable-write \
+		    --with-fsprobe=builtin
 	make  -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
 	cd sys-utils