From 9f3170a31560f62c06ce34dbb503bd94b0f49e8e Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Thu, 10 May 2012 19:34:49 +0200
Subject: [PATCH] Revert "util-linux: manually install to toolchain because of
 wrong relinking at 'make install' time"

This reverts commit acb2c5d4a514540506881f3efa8c2c47a6fa0d15.
---
 packages/sysutils/util-linux/build | 33 +++++++++++++-----------------
 1 file changed, 14 insertions(+), 19 deletions(-)

diff --git a/packages/sysutils/util-linux/build b/packages/sysutils/util-linux/build
index 6a5546761e..fefe3def0e 100755
--- a/packages/sysutils/util-linux/build
+++ b/packages/sysutils/util-linux/build
@@ -23,6 +23,8 @@
 . config/options $1
 
 cd $PKG_BUILD
+#scanf_cv_type_modifier=ms \
+#gt_cv_func_gnugettext1_libintl=no \
 ./configure --host=$TARGET_NAME \
             --build=$HOST_NAME \
             --prefix=/usr \
@@ -80,24 +82,17 @@ cd $PKG_BUILD
             --without-slang \
             --without-utempter
 
-make -C libuuid
-make -C libblkid
-make -C fsck fsck
-make -C misc-utils blkid
-make -C sys-utils swapon
-make -C sys-utils fstrim
+make
 
-# hack around wrong relinking on 'make install'
-  mkdir -p $SYSROOT_PREFIX/usr/include/uuid
-    cp -PR libuuid/src/uuid.h $SYSROOT_PREFIX/usr/include/uuid
-  mkdir -p $SYSROOT_PREFIX/usr/lib
-    cp -PR libuuid/src/.libs/libuuid.so* $SYSROOT_PREFIX/usr/lib
-  mkdir -p $SYSROOT_PREFIX/usr/lib/pkgconfig
-    cp -PR libuuid/uuid.pc $SYSROOT_PREFIX/usr/lib/pkgconfig
+$MAKEINSTALL
 
-  mkdir -p $SYSROOT_PREFIX/usr/include/blkid
-    cp -PR libblkid/src/blkid.h $SYSROOT_PREFIX/usr/include/blkid
-  mkdir -p $SYSROOT_PREFIX/usr/lib
-    cp -PR libblkid/src/.libs/libblkid.so* $SYSROOT_PREFIX/usr/lib
-  mkdir -p $SYSROOT_PREFIX/usr/lib/pkgconfig
-    cp -PR libblkid/blkid.pc $SYSROOT_PREFIX/usr/lib/pkgconfig
+#make -C fsck fsck
+#make -C mount swapon
+#make -C misc-utils blkid
+#make -C sys-utils fstrim
+#make -C libuuid
+#make -C libblkid
+
+# libuuid must be installed before libblkid!!!
+#  $MAKEINSTALL -C libuuid
+#  $MAKEINSTALL -C libblkid