Work around broken glibc-2.10 on 32bit systems and fallocate #300307 by Marco Clocchiatti.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 33 insertions, 5 deletions

diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog
index 4fb8e1bc0bfc..5f7e42c2679a 100644
--- a/sys-apps/util-linux/ChangeLog
+++ b/sys-apps/util-linux/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/util-linux
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.304 2010/03/09 00:58:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.305 2010/03/20 04:07:43 vapier Exp $
+
+  20 Mar 2010; Mike Frysinger <vapier@gentoo.org> util-linux-2.17.1.ebuild:
+  Work around broken glibc-2.10 on 32bit systems and fallocate #300307 by
+  Marco Clocchiatti.
 
   09 Mar 2010; Mike Frysinger <vapier@gentoo.org> util-linux-2.17.1.ebuild:
   Update loop-aes patch #307987.
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 3c59bea10e02..c349738843d4 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 0001-libblkid-fix-segfault-in-drdb.patch 1035 RMD160 d0448b1c0a9eabcc3fd4d18c3f92de468056f3e2 SHA1 066f177bb5ef156053d4deb36c6e0b8577ed1bf7 SHA256 2a2bf7340f21cb3d77f3641ef7fc4aff629b1a392c6f0e52329fc05ae9c567fa
 AUX crypto-loop.confd 412 RMD160 5e65febe9641a8362078fdae39b4ac955fb2e63b SHA1 2f881a24ff67115e74de7a11c66a34a745060864 SHA256 188c945e5e6c54cb14874057c625ff30b72fb33d3d5648e53de2f231a3375600
 AUX crypto-loop.initd 1729 RMD160 fa53920677d793cf98cad994e4dabd53e53d8d04 SHA1 19d3b7c4aa95cdadde2f6fb81a391081eae04f42 SHA256 b8329250c865e79a1e761d713c2270c99d5fe96e0d5a7ca646946fab65c4b810
@@ -11,8 +14,15 @@ DIST util-linux-ng-2.17.tar.bz2 3767857 RMD160 adedfb12e415b5e48067c579ada4b6a93
 EBUILD util-linux-2.16.1.ebuild 2562 RMD160 b1d0723cfd7fd25d7c4b78e64b9b5153b42826b8 SHA1 8a4329a006709e91b04eed2117d2b9a987dcd2e8 SHA256 8f8d00dc0018428eca148fd0cee9ec4138584c2e4bd9cea2a6bb1dda12473271
 EBUILD util-linux-2.16.2.ebuild 2599 RMD160 c1e3c9a2b4f65074aeec0d377a85573d54c8cca6 SHA1 e2429b7a7da6de737b01719f55b9674ee2bfead8 SHA256 aac6bb667221ab92704b857d4e26805e670f5f7ba7f175706e4b3d613db6b814
 EBUILD util-linux-2.17-r1.ebuild 2701 RMD160 53aee5255405596ca1054a344ba3291d4a1337b9 SHA1 63e4db0aa929f73d633b8a35b91adaf110ac8244 SHA256 7a716f822397684f3888035aa9d97bfb09364b779d22c9c0bd8e2f24de7b19a2
-EBUILD util-linux-2.17.1.ebuild 2631 RMD160 7d52019e0dfbe5e628dfee331f61eede7c6d84c0 SHA1 1fd1cd29e0e5e1ea8d4d6fc21562449637b36c78 SHA256 ed05c1922c5916d5fe439a001eea2191aefe9dbb725779e10d441449dacf111a
+EBUILD util-linux-2.17.1.ebuild 3038 RMD160 45ff16d752c4d25b4df1ec9cd2d19a6249bf3456 SHA1 af361e7d03f19e0cb7607ebc69c743afccc7ab1b SHA256 3966c1c28599346299b12267f20d77d3746c70542571b771858776ad2a99e143
 EBUILD util-linux-2.17.ebuild 2630 RMD160 699e758f0d33872a873c5172ed5cf2ca7bf4af3c SHA1 512eeda6b7178e39246b1738790146412d894442 SHA256 f01102e7fe9016cad08b899219e0de1bfad4d07aaaaec7b5c8e923ed56476dac
 EBUILD util-linux-9999.ebuild 2630 RMD160 5d43edb79aee7b5ee9007f34ade094f28bbc59f4 SHA1 de01bb30e5a93fdd79c3120ac06105b1c2627944 SHA256 d20f9093ac903a641831c5aff4725b9523205faec28aeb70861a4c6707bfa692
-MISC ChangeLog 46320 RMD160 01812d0e69a34f3bba0971ad205dce39510cf9b6 SHA1 23b323c4d9823915f78faca392a822faf39dfda8 SHA256 abc91c3dba9ae2adeade6bcce3d6c8ee664e8303cdce6e608a8e9d45be216001
+MISC ChangeLog 46492 RMD160 85d49fc7a68c5e1f0cab1ec90bd25bc312d704ed SHA1 31d33f13566a3ee876cc596615e009d69c2ffd5a SHA256 16a79f68c9b13ab5b7cfde784eca9e8cf29d90e8e2bdfa31807565606ce9089c
 MISC metadata.xml 309 RMD160 d386a285872f68f80198f63be994dc8179e2254f SHA1 0e2ba366c96f233cf76e649dfa1eb1ba1ab8a897 SHA256 ccc7a0dd3a5a579aac578db211c116840fecf84e7e2c92d21efb430b51467264
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iF4EAREIAAYFAkukShEACgkQTwhj9JtAlp4I2AEAkJyne4KY7ZYJwsu1fLjgOtVT
+JJRT8xJwwWvjlbQMklYA/3BFhsemWWRH2veVGOUlWFAie+PfhAnG1Az3vTdzQMSr
+=qctr
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/util-linux/util-linux-2.17.1.ebuild b/sys-apps/util-linux/util-linux-2.17.1.ebuild
index 0f9a538d560c..41e61417830f 100644
--- a/sys-apps/util-linux/util-linux-2.17.1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.17.1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.17.1.ebuild,v 1.2 2010/03/09 00:58:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.17.1.ebuild,v 1.3 2010/03/20 04:07:43 vapier Exp $
 
 EAPI="2"
 
 EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux-ng/util-linux-ng.git"
-inherit eutils toolchain-funcs libtool
+inherit eutils toolchain-funcs libtool flag-o-matic
 [[ ${PV} == "9999" ]] && inherit git autotools
 
 MY_PV=${PV/_/-}
@@ -50,7 +50,21 @@ src_prepare() {
 	elibtoolize
 }
 
+lfs_fallocate_test() {
+	# Make sure we can use fallocate with LFS #300307
+	cat <<-EOF > "${T}"/fallocate.c
+	#define _GNU_SOURCE
+	#include <fcntl.h>
+	main() { return fallocate(0, 0, 0, 0); }
+	EOF
+	append-lfs-flags
+	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.c -o /dev/null >/dev/null 2>&1 \
+		|| export ac_cv_func_fallocate=no
+	rm -f "${T}"/fallocate.c
+}
+
 src_configure() {
+	lfs_fallocate_test
 	econf \
 		$(use_enable nls) \
 		--enable-agetty \