[patch] Patch to make libmount optional

util-linux-uclibc.patch (text/plain), 1.00 KB, created by James Le Cuirot on 2012-04-16 12:41:09 UTC

--- util-linux-2.21.1.ebuild.orig	2012-04-14 06:31:27.000000000 +0100
+++ util-linux-2.21.1.ebuild	2012-04-16 13:39:36.370983376 +0100
@@ -25,7 +25,7 @@
 
 LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain"
 SLOT="0"
-IUSE="+cramfs crypt ddate loop-aes ncurses nls old-linux perl selinux slang static-libs uclibc unicode"
+IUSE="+cramfs crypt ddate loop-aes ncurses nls old-linux perl selinux slang static-libs unicode"
 
 RDEPEND="!sys-process/schedutils
 	!sys-apps/setarch
@@ -49,7 +49,6 @@
 	else
 		use loop-aes && epatch "${WORKDIR}"/util-linux-*.diff
 	fi
-	use uclibc && sed -i -e s/versionsort/alphasort/g -e s/strverscmp.h/dirent.h/g mount/lomount.c
 	elibtoolize
 }
 
@@ -103,7 +102,11 @@
 	fi
 
 	# need the libs in /
-	gen_usr_ldscript -a blkid mount uuid
+	gen_usr_ldscript -a blkid uuid
+
+	# uClibc can't build libmount (yet)
+	[[ -f "${ED}/usr/$(get_libdir)/libmount.so" ]] && gen_usr_ldscript -a mount
+
 	# e2fsprogs-libs didnt install .la files, and .pc work fine
 	find "${ED}" -name '*.la' -delete