disable building of programs when cross-compiling

Package-Manager: portage-2.1.3_rc9

3 files changed, 34 insertions, 13 deletions

diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 982cd5361490..c58879a285d0 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 2.3.1/glibc-2.3.1-ctype-compat-v3.patch 2823 RMD160 f1162b7f313f7ea18fb178157d3bd6205d818e3a SHA1 d1dceb79689e9c627ebd630389ec1948d7a0a6e4 SHA256 0bc07eb47578d5bfb98774b18bf07aee2af44a7ccd947602c223b34e0d88394a
 MD5 941f13d27badc76c1e3704c59acaff26 files/2.3.1/glibc-2.3.1-ctype-compat-v3.patch 2823
 RMD160 f1162b7f313f7ea18fb178157d3bd6205d818e3a files/2.3.1/glibc-2.3.1-ctype-compat-v3.patch 2823
@@ -468,7 +471,7 @@ DIST glibc-2.5-patches-1.6.tar.bz2 533385 RMD160 4568b467d225b9fc3b5f6cdb9341826
 DIST glibc-2.5-patches-1.7.tar.bz2 535578 RMD160 090764d7267ab1023486d423fbaa00809597bcfd SHA1 718a27f6c9a9de95fa70a54af3bd33621ca7d8a2 SHA256 1f56ee67b56ffa57f3f15aeb75dd6b663187a1ec7958fc323de5d0c51347146c
 DIST glibc-2.5-patches-1.8.tar.bz2 493626 RMD160 925758819ac682dcbcb38a1f3522cff6f3581e5b SHA1 ef09fd0ef5c609ac86c6cef23f377476d4c92fc7 SHA256 d71810e9e25a131633a5681b4a632f09caf4957451ee67f0514b7264314eeb84
 DIST glibc-2.5.tar.bz2 15321839 RMD160 25a0a460c0db1e5b7c570e5087461696f2096fd2 SHA1 ec9a007c4875062099a4701ac9137fcdb5a71447 SHA256 9b2e12bb1eafb55ab2e5a868532b8e6ec39216c66c25b8998d7474bc4d4eb529
-DIST glibc-2.6-patches-1.4.tar.bz2 88209 RMD160 b0bd771cebbac93d812bf352c02346d84b05c4c1 SHA1 551c71074ee29b3060773d4ad031a6eb42c6665a SHA256 8a20749c5fe874d17174ea4743c74bf5479efeac79f44418814c398713cd4f7d
+DIST glibc-2.6-patches-1.5.tar.bz2 90012 RMD160 f55f2fdb00f481504f47b2cb27726bd7ed989527 SHA1 53b416d23d4ed884998ee469958c793ff088fdd0 SHA256 76ba64cbfe9698a870c052b26b91102c7635bd70401bbe1042e81bba78f22c8c
 DIST glibc-2.6.tar.bz2 15637436 RMD160 9f201f54d41941df299ab88722f4095dd417a5e4 SHA1 33a7d9aab6f0a76161d59341273e46d9aae8fc01 SHA256 f773ae5762c193091df46244ce355e38d358e8f8be088be0dbf934a193063bba
 DIST glibc-fedora-20041219T2331.tar.bz2 761998 RMD160 cfc859a7e0a904cfb340c832267d3377e850cf6e SHA1 31e10b882bb9288831e1a1b2ed0ddece7099ffbd SHA256 e36ffa84388ebb746cb80c37d6fd1acc9e45e07b85c30b0a2ad9f511fae59cec
 DIST glibc-infopages-2.3.5.tar.bz2 1273846 RMD160 14a587e5df98ad113fa1499d2a958efbb47c437a SHA1 bb974b6dacd02161532717a9d8f97248acd6da14 SHA256 79a602955e3cf4288fa9967240b397281594acab18c263d2ef864e7d71aa54e1
@@ -526,10 +529,10 @@ EBUILD glibc-2.5-r4.ebuild 38679 RMD160 94adde51f8b61d6eeeffd917c0d03618f0e242b6
 MD5 61b7e338b6fe7118664a93695095ad5d glibc-2.5-r4.ebuild 38679
 RMD160 94adde51f8b61d6eeeffd917c0d03618f0e242b6 glibc-2.5-r4.ebuild 38679
 SHA256 3a8b5fca45f9511719a8abaca4d481b9c6813e9926aa48cae9983ad9b63417c9 glibc-2.5-r4.ebuild 38679
-EBUILD glibc-2.6.ebuild 38894 RMD160 ba88801ea1827d0fc40bdb42bf1f24db9422bf20 SHA1 f123741967ae14f1fa68b57dc00d18b94b491f41 SHA256 43c60c1c0d02b552e80b028c80808c08186523db6b7bae966699088ad9a31ab4
-MD5 79621c0f0f9f36eb530bd25b17c9968d glibc-2.6.ebuild 38894
-RMD160 ba88801ea1827d0fc40bdb42bf1f24db9422bf20 glibc-2.6.ebuild 38894
-SHA256 43c60c1c0d02b552e80b028c80808c08186523db6b7bae966699088ad9a31ab4 glibc-2.6.ebuild 38894
+EBUILD glibc-2.6.ebuild 39418 RMD160 cd750f20b5fa16bb38a7133db3d1a292bc4c027e SHA1 c0d946d392d28ccb7fb867d60339c4506960fcea SHA256 440fcd8d379c7adeb2eb1cbcb83097b2f547b822916820040bec57fe9b8e1913
+MD5 8dcda93dedd016bc6c7eace9a5cddc63 glibc-2.6.ebuild 39418
+RMD160 cd750f20b5fa16bb38a7133db3d1a292bc4c027e glibc-2.6.ebuild 39418
+SHA256 440fcd8d379c7adeb2eb1cbcb83097b2f547b822916820040bec57fe9b8e1913 glibc-2.6.ebuild 39418
 MISC ChangeLog 104650 RMD160 64a7a648addc6fc162091ea0b67a8edfd6854a7a SHA1 68d07d504e22db20fd6756dbc9b5114378ebbcac SHA256 0f908a82ec0f26384c287b9bf8e6bc71d89d2b6ad7edcae3063bd5d66ee687e0
 MD5 9ec5d4d07df3e689b1e225645d80bcd9 ChangeLog 104650
 RMD160 64a7a648addc6fc162091ea0b67a8edfd6854a7a ChangeLog 104650
@@ -565,6 +568,13 @@ SHA256 347f49efa2bc3ea4836f4fe5ac10a00ab84ce12b5b64e5f6eecd979c32416dfd files/di
 MD5 8fb737a670df02044e87c750f06bcba3 files/digest-glibc-2.5-r4 1280
 RMD160 8f822529a03eaaa016cf10b653c5507eb2026e08 files/digest-glibc-2.5-r4 1280
 SHA256 6419a0a7af10b901eff6afd36e0982ba7b826e2645ab26b895895eab19bbbc5f files/digest-glibc-2.5-r4 1280
-MD5 1d3063f72e6daf93adfd9bdf95dac34c files/digest-glibc-2.6 1006
-RMD160 4c0a5f6855cebe8ebd04919d803a5c77ef35a9d0 files/digest-glibc-2.6 1006
-SHA256 f51eeddc285765fd2b6001d0e2dec497496bc7e9e540fe25e0d99168bbf5c1a3 files/digest-glibc-2.6 1006
+MD5 090ae87a212fba22dd1af6a67d2e9718 files/digest-glibc-2.6 1006
+RMD160 e0c1c286cdc689a4097ccad1df921ef9afa8bcc0 files/digest-glibc-2.6 1006
+SHA256 677b87cfee3c77ac3eec3278beb8049d029d691b8839048d98f27275b40475ce files/digest-glibc-2.6 1006
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.5 (GNU/Linux)
+
+iD8DBQFGps3Mp/wUKkr7RBoRAul/AJ958RQYSm/T5MJulAPDmzAfLea1uACeLlZW
+hrTx8FjEWwhWLEnQu1TQIVk=
+=r7It
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/files/digest-glibc-2.6 b/sys-libs/glibc/files/digest-glibc-2.6
index 073fe790647c..6b45f3174955 100644
--- a/sys-libs/glibc/files/digest-glibc-2.6
+++ b/sys-libs/glibc/files/digest-glibc-2.6
@@ -1,6 +1,6 @@
-MD5 58f9c91a22877a8aa7b329f2048a63e4 glibc-2.6-patches-1.4.tar.bz2 88209
-RMD160 b0bd771cebbac93d812bf352c02346d84b05c4c1 glibc-2.6-patches-1.4.tar.bz2 88209
-SHA256 8a20749c5fe874d17174ea4743c74bf5479efeac79f44418814c398713cd4f7d glibc-2.6-patches-1.4.tar.bz2 88209
+MD5 19e5eac422209d6399103ce9d75fdf3b glibc-2.6-patches-1.5.tar.bz2 90012
+RMD160 f55f2fdb00f481504f47b2cb27726bd7ed989527 glibc-2.6-patches-1.5.tar.bz2 90012
+SHA256 76ba64cbfe9698a870c052b26b91102c7635bd70401bbe1042e81bba78f22c8c glibc-2.6-patches-1.5.tar.bz2 90012
 MD5 0f471d7cb29dd07786082ad23f787949 glibc-2.6.tar.bz2 15637436
 RMD160 9f201f54d41941df299ab88722f4095dd417a5e4 glibc-2.6.tar.bz2 15637436
 SHA256 f773ae5762c193091df46244ce355e38d358e8f8be088be0dbf934a193063bba glibc-2.6.tar.bz2 15637436
diff --git a/sys-libs/glibc/glibc-2.6.ebuild b/sys-libs/glibc/glibc-2.6.ebuild
index 47a28aa96982..9ab416a3a380 100644
--- a/sys-libs/glibc/glibc-2.6.ebuild
+++ b/sys-libs/glibc/glibc-2.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.6.ebuild,v 1.13 2007/07/24 08:10:35 yoswink Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.6.ebuild,v 1.14 2007/07/25 04:11:49 vapier Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -27,7 +27,7 @@ GLIBC_MANPAGE_VERSION="none"
 GLIBC_INFOPAGE_VERSION="none"
 
 # Gentoo patchset
-PATCH_VER="1.4"
+PATCH_VER="1.5"
 
 GENTOO_TOOLCHAIN_BASE_URI="mirror://gentoo"
 GENTOO_TOOLCHAIN_DEV_URI="http://dev.gentoo.org/~azarah/glibc/XXX http://dev.gentoo.org/~vapier/dist/XXX"
@@ -948,6 +948,10 @@ glibc_do_configure() {
 	cd "${GBUILDDIR}"
 	einfo "Configuring GLIBC for $1 with: ${myconf// /\n\t\t}"
 	"${S}"/configure ${myconf} || die "failed to configure glibc"
+
+	# since we'll be punting them for cross-compilers, and they can cause
+	# problems (ia64+static), we'll just skip building altogether
+	is_crosscompile && sed -i '1ibuild-programs = no' config.make
 }
 
 fix_lib64_symlinks() {
@@ -1084,6 +1088,13 @@ pkg_setup() {
 		fi
 	fi
 
+	# users have had a chance to phase themselves, time to give em the boot
+	if [[ -e ${ROOT}/etc/locale.gen ]] && [[ -e ${ROOT}/etc/locales.build ]] ; then
+		eerror "You still haven't deleted ${ROOT}/etc/locales.build."
+		eerror "Do so now after making sure ${ROOT}/etc/locale.gen is kosher."
+		die "lazy upgrader detected"
+	fi
+
 	if [[ ${CTARGET} == i386-* ]] ; then
 		eerror "i386 CHOSTs are no longer supported."
 		eerror "Chances are you don't actually want/need i386."