diff --git a/packages/sysutils/util-linux/build b/packages/sysutils/util-linux/build index fefe3def0e..6a5546761e 100755 --- a/packages/sysutils/util-linux/build +++ b/packages/sysutils/util-linux/build @@ -23,8 +23,6 @@ . 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 \ @@ -82,17 +80,24 @@ cd $PKG_BUILD --without-slang \ --without-utempter -make +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 -$MAKEINSTALL +# 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 -#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 + 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