Disable selinux on crosscompile; bug #186780

Package-Manager: portage-2.2_rc31/cvs/Linux i686

3 files changed, 20 insertions, 5 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index 8da2aa193ee4..e05f2a8f3f6a 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/glibc
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.622 2009/04/13 15:17:59 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.623 2009/05/02 02:38:22 halcy0n Exp $
+
+  02 May 2009; Mark Loeser <halcy0n@gentoo.org>
+  files/eblits/src_compile.eblit:
+  Disable selinux on crosscompile; bug #186780
 
   13 Apr 2009; Jeroen Roovers <jer@gentoo.org>
   glibc-2.8_p20080602-r1.ebuild:
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 53a131d1deac..31f2e2b1b92b 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
 AUX 2.3.1/glibc-2.3.1-fpu-cw-mips.patch 433 RMD160 4eda3122052714ea216ab402ea5a3a7f4654f48e SHA1 afb44c9a12e3d4ee28c61dd62522244c09776da4 SHA256 8e68949febc8b14941d15b9afd914b158db11d282d19c528f75a0b58c379dcce
 AUX 2.3.1/glibc-2.3.1-libc_wait-compat.patch 1053 RMD160 429e2065d45c4c68aa5f39eacf6d8ae5fbda63c8 SHA1 001a4af11de2029bcbb01a0afc4051cb4119807a SHA256 db4c92f86d3404ba4cc2f4d28e17517ed09124efcb518394d9c1df27d8540962
@@ -106,7 +109,7 @@ AUX eblits/common.eblit 8751 RMD160 7e0b5242366606725ef06e0a496638cafcdac676 SHA
 AUX eblits/pkg_postinst.eblit 1159 RMD160 4b99846819bf0471d1104a8a17dd260796644f9d SHA1 4a2980fede3edebc7960d40db7cf935c7c854859 SHA256 76c403cf5c77a3a3bb7441566335f0c8da2584eaa21f05ab400e7bb00f9db810
 AUX eblits/pkg_preinst.eblit 3285 RMD160 990d7ee7cfa1ba79a19bc6c01c05817ebfc0ee96 SHA1 3ee2fe58fa7ca246311cf5ef23fa1ccbe509cf49 SHA256 8bc7dea37213048787ce0bec61e9abe8adabb547b5385024bf2549d0a036239c
 AUX eblits/pkg_setup.eblit 2357 RMD160 839227a7d00227c137e06b34cc34ae56e9fb91aa SHA1 a13f73f5f767e6fa3633d31ab72891e318b116e5 SHA256 4a100a4b2f9ca77d509411dc719d2e3a24606dd1d20a18e2ebf705a1a65398c5
-AUX eblits/src_compile.eblit 5275 RMD160 053edde7b9ed3b334515e1fbc118c008b7359135 SHA1 a96b8d1732b7eca1336b63ad77d061a6d42a662e SHA256 869f2eec38b883d357ecc63d726bc7fda442301823e88cf8afea10b76ee18e0f
+AUX eblits/src_compile.eblit 5322 RMD160 b72938a98648c744b7195f3ed62b8d9b76f33ae2 SHA1 81888c8385bd577541a8b4434efca39b57aad5ad SHA256 5a873118d72f7a851c4e87a04585adeb06a356176179a685579e740e4210639d
 AUX eblits/src_install-2.6.eblit 7946 RMD160 6cc258a316b78212777ab328a3c0cb73de1616d4 SHA1 94895689b56fd712156e8ac84a2a639d8475da03 SHA256 54081c34217c230d0ff43c5df378897a37576e727fe41ee4d681767110667f3e
 AUX eblits/src_install.eblit 7893 RMD160 789a4518bbb0be8a028f331e2673e423d2717a93 SHA1 7288c1bcc7f05e8aa0d4f90d4c63be128a2d225d SHA256 d5f0cb0345c33f66a90d73e7e0264867d9bcf4a137190d6ae4008d63a3b7bd56
 AUX eblits/src_test.eblit 1162 RMD160 349db09c5f2c2e412a108b8c5371adf946e1a3f0 SHA1 357ef650e1dce62d5d688133426bc62b9085009d SHA256 bac1db2da478f6e6709275c36cc1f9a98fac7fcc2e80bd8831f2077207754962
@@ -199,5 +202,12 @@ EBUILD glibc-2.8_p20080602.ebuild 13553 RMD160 136c8d3cf1a633484edf33a72475fd801
 EBUILD glibc-2.9_p20081201-r1.ebuild 13638 RMD160 499cb90beb840dec3630096628a38e6991d9bcd1 SHA1 1c58040d2cc552182fb0020d0cc5145648180746 SHA256 14685fa0ea5b40c61818e6bc597df81addea8e2fedf5f5d307ae80390985ac6c
 EBUILD glibc-2.9_p20081201-r2.ebuild 7742 RMD160 67a23f2ccab26c70a6c47aac230633914c028966 SHA1 9ede3d8d75f636baa5c8138fecf8f53be45e9cad SHA256 da18103ed65e11e7f1596da38fdc76fef1800c6aeb586c1a2089f892053655f1
 EBUILD glibc-2.9_p20081201.ebuild 13449 RMD160 ba463ccf508a887cab638d7f65aa809dd1933a2b SHA1 0e7798f24c20e8baaae9fac47c3322eae4e2dda1 SHA256 2da6944caf8bc892bcc05b64eee224946baff8d65e375587dac3582d22766e58
-MISC ChangeLog 116794 RMD160 3ceb9919bd994698253f2af4c11101423867bccc SHA1 9d3ae88a681c4bb22a263c3c4c0880435be64079 SHA256 fda362b27c537d4e11a9dd4f6dce71ca0c8da791a3eb6490ea0d2d27d89e878d
+MISC ChangeLog 116928 RMD160 877eb7bd4579791dcf3221ee9ece6c744d3ecf67 SHA1 76863890ffb110325b220150c5792abd23f7860c SHA256 4fdf4f85192c6394658aa1d2528d7c63a319d640b795b326b1d4c8732dffdcb2
 MISC metadata.xml 1112 RMD160 1aa9770356149948593ebe35a1bd3940dd72fca2 SHA1 40514cc45c26bab671d78aa1567441bf72b0c6cc SHA256 4acea698dc4f66c17f4f3f81b28cd6b32f5425fd49f380df4a016489f786b1f5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkn7sicACgkQCRZPokWLroRdCgCZAf0B4WgYq+iyooJyhEyyuGUH
+3gkAnimuBTsloSLWBdT8INbXhWogH9BW
+=2RyF
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/files/eblits/src_compile.eblit b/sys-libs/glibc/files/eblits/src_compile.eblit
index c7ce858acd30..b4d0318abf8c 100644
--- a/sys-libs/glibc/files/eblits/src_compile.eblit
+++ b/sys-libs/glibc/files/eblits/src_compile.eblit
@@ -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/files/eblits/src_compile.eblit,v 1.6 2008/11/29 21:05:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_compile.eblit,v 1.7 2009/05/02 02:38:25 halcy0n Exp $
 
 glibc_do_configure() {
 	local myconf
@@ -55,7 +55,8 @@ glibc_do_configure() {
 	# Since SELinux support is only required for nscd, only enable it if:
 	# 1. USE selinux
 	# 2. only for the primary ABI on multilib systems
-	if use selinux ; then
+	# 3. Not a crosscompile
+	if ! is_crosscompile && use selinux ; then
 		if use multilib || has_multilib_profile ; then
 			if is_final_abi ; then
 				myconf="${myconf} --with-selinux"