tweak stupid xen warning so it only shows on x86 #154736 by Peter Abrahamsen

Package-Manager: portage-2.1.2_rc1-r5

4 files changed, 22 insertions, 22 deletions

diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 629ec805db38..2380f306c17b 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -531,22 +531,22 @@ EBUILD glibc-2.3.6-r4.ebuild 37392 RMD160 f27d7ff6404a966c2b73c4711b3e8b6614f2e6
 MD5 021c45d10c8d52d96116633239cc9545 glibc-2.3.6-r4.ebuild 37392
 RMD160 f27d7ff6404a966c2b73c4711b3e8b6614f2e61e glibc-2.3.6-r4.ebuild 37392
 SHA256 c7dccd219ac1e2145185eb5c5905dfb4cd2cb60b69a715646f103bf1a4a831b6 glibc-2.3.6-r4.ebuild 37392
-EBUILD glibc-2.3.6-r5.ebuild 37630 RMD160 92b8b48237165a5bb02a87a743d2e451e706ba6c SHA1 f339154e5b2aa448ee6e3d4320b6aa066698e5ed SHA256 a693788e45d767d3d0c82851bded9d569f4f0259091f9f083bbd803a7551ad1d
-MD5 3fd51b2d2076fb2867492e48a7c19276 glibc-2.3.6-r5.ebuild 37630
-RMD160 92b8b48237165a5bb02a87a743d2e451e706ba6c glibc-2.3.6-r5.ebuild 37630
-SHA256 a693788e45d767d3d0c82851bded9d569f4f0259091f9f083bbd803a7551ad1d glibc-2.3.6-r5.ebuild 37630
+EBUILD glibc-2.3.6-r5.ebuild 37657 RMD160 e1542beea4be3c625bfb5af372e35752ff15ffdb SHA1 feb25e6db30a8d9413561c1fa9b2683e7149f6c8 SHA256 4f67ccc1bceab1410035f2c756f8e1e60cd1c5c25769b3fd45444da3b37e2303
+MD5 a982f489f883127ec023926ee4ee7ebb glibc-2.3.6-r5.ebuild 37657
+RMD160 e1542beea4be3c625bfb5af372e35752ff15ffdb glibc-2.3.6-r5.ebuild 37657
+SHA256 4f67ccc1bceab1410035f2c756f8e1e60cd1c5c25769b3fd45444da3b37e2303 glibc-2.3.6-r5.ebuild 37657
 EBUILD glibc-2.4-r3.ebuild 39370 RMD160 f4416a81f7f6e20f66679b107308091edf00958a SHA1 a93b767c6bacb79f8f9e93cd13786a76b2374d12 SHA256 6a39a922cad1b3f6b331198a8fbea353e7c618747a877c31086770c3d274c94d
 MD5 d4b21ddd35ec224dcfa5aefe3b70aec1 glibc-2.4-r3.ebuild 39370
 RMD160 f4416a81f7f6e20f66679b107308091edf00958a glibc-2.4-r3.ebuild 39370
 SHA256 6a39a922cad1b3f6b331198a8fbea353e7c618747a877c31086770c3d274c94d glibc-2.4-r3.ebuild 39370
-EBUILD glibc-2.4-r4.ebuild 39077 RMD160 4de27a3452c95786b1f48ce1bfba1d4ffc1864b5 SHA1 a7ffabc57627de82cf8872d985a43a68912c636c SHA256 754004ee89c415ba2cf282d92f909546e497db14bddb608d77606c7325a528e2
-MD5 ab05a51674c19fa2b7bec37c3385e991 glibc-2.4-r4.ebuild 39077
-RMD160 4de27a3452c95786b1f48ce1bfba1d4ffc1864b5 glibc-2.4-r4.ebuild 39077
-SHA256 754004ee89c415ba2cf282d92f909546e497db14bddb608d77606c7325a528e2 glibc-2.4-r4.ebuild 39077
-EBUILD glibc-2.5.ebuild 37135 RMD160 76a266185e3c2de65e65d9e9b1683b45fc13df2b SHA1 32ff7f685a4d96e6d1410e67d1e633d9c884d92f SHA256 16b352b16892b55e7c4978ad2dc0ba8662d0144e7d460e597b45c55c8c3b2096
-MD5 6b7c344e19fb6deafad0c9e3d2d3e913 glibc-2.5.ebuild 37135
-RMD160 76a266185e3c2de65e65d9e9b1683b45fc13df2b glibc-2.5.ebuild 37135
-SHA256 16b352b16892b55e7c4978ad2dc0ba8662d0144e7d460e597b45c55c8c3b2096 glibc-2.5.ebuild 37135
+EBUILD glibc-2.4-r4.ebuild 39107 RMD160 223923a0ac019c3f25bc781741d02bec829f82bd SHA1 bc80cbb77727b7385d50ccf00f8b521733f7e182 SHA256 4d2ee062019623c64c1367da0a65ac7162ca77e8aafe3486d05babdb3ca65739
+MD5 9529d9b271dfe641a24056b5b0a64854 glibc-2.4-r4.ebuild 39107
+RMD160 223923a0ac019c3f25bc781741d02bec829f82bd glibc-2.4-r4.ebuild 39107
+SHA256 4d2ee062019623c64c1367da0a65ac7162ca77e8aafe3486d05babdb3ca65739 glibc-2.4-r4.ebuild 39107
+EBUILD glibc-2.5.ebuild 37164 RMD160 765f785f371e4f74cefc1bd3cfb6b0d49a2980b7 SHA1 9272e971b940d0acab14d6c3d80625761fedd017 SHA256 5a878bea9012432618b2ca7a628d37f2c1e51ec8956225ad7534c593f352b6e6
+MD5 96e5f6f849787c7f46e463c48ee493a4 glibc-2.5.ebuild 37164
+RMD160 765f785f371e4f74cefc1bd3cfb6b0d49a2980b7 glibc-2.5.ebuild 37164
+SHA256 5a878bea9012432618b2ca7a628d37f2c1e51ec8956225ad7534c593f352b6e6 glibc-2.5.ebuild 37164
 MISC ChangeLog 97266 RMD160 9aa38617d0ed0e1476eec169b780981661b538ef SHA1 e187b69c84815e221e08a633219c58fb204ded43 SHA256 ec8455eefe550ed888a4f4bcc6d64cad1da301822498c896cc5c8d2c35b83ec9
 MD5 00664ed3dc9798dbcbaa009ac285fdba ChangeLog 97266
 RMD160 9aa38617d0ed0e1476eec169b780981661b538ef ChangeLog 97266
@@ -604,9 +604,9 @@ MD5 0ef85c335e10127d3e21077ab8034f12 files/digest-glibc-2.5 1280
 RMD160 34e5f2b01652b2ae928c40fefe948ff971bb7851 files/digest-glibc-2.5 1280
 SHA256 f65c057f070beb912fdc31c87bdec28342093306c3387f73aa831178e3a8d875 files/digest-glibc-2.5 1280
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFU0gpKRy60XGEcJIRAlB+AJ47DhS+pwcnvb+/z2eSuaca6uwhyQCgh+Le
-2C9qAdNXCJH0UXZC6zD5MHM=
-=ms8q
+iD8DBQFFVRHPamhnQswr0vIRAnEpAKCw8yXAsxQ8A90Y75hO05pGLP5RbgCfeFVY
+yRLHX9kZQ8X4Uf25Yco8giM=
+=8PEo
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/glibc-2.3.6-r5.ebuild b/sys-libs/glibc/glibc-2.3.6-r5.ebuild
index 9b936268a51f..57198902138e 100644
--- a/sys-libs/glibc/glibc-2.3.6-r5.ebuild
+++ b/sys-libs/glibc/glibc-2.3.6-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.6-r5.ebuild,v 1.12 2006/11/09 15:24:50 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.6-r5.ebuild,v 1.13 2006/11/10 23:56:24 vapier Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -1043,7 +1043,7 @@ pkg_setup() {
 		die "nptlonly without nptl"
 	fi
 
-	if [[ -e /proc/xen ]] && ! is-flag -mno-tls-direct-seg-refs ; then
+	if [[ -e /proc/xen ]] && [[ $(tc-arch) == "x86" ]] && ! is-flag -mno-tls-direct-seg-refs ; then
 		ewarn "You are using Xen but don't have -mno-tls-direct-seg-refs in your CFLAGS."
 		ewarn "This will result in a 50% performance penalty, which is probably not what you want."
 	fi
diff --git a/sys-libs/glibc/glibc-2.4-r4.ebuild b/sys-libs/glibc/glibc-2.4-r4.ebuild
index 1ab6131a253e..7762bbf18651 100644
--- a/sys-libs/glibc/glibc-2.4-r4.ebuild
+++ b/sys-libs/glibc/glibc-2.4-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.4-r4.ebuild,v 1.8 2006/11/08 07:23:01 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.4-r4.ebuild,v 1.9 2006/11/10 23:56:24 vapier Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -1074,7 +1074,7 @@ pkg_setup() {
 		die "nptlonly without nptl"
 	fi
 
-	if [[ -e /proc/xen ]] && ! is-flag -mno-tls-direct-seg-refs ; then
+	if [[ -e /proc/xen ]] && [[ $(tc-arch) == "x86" ]] && ! is-flag -mno-tls-direct-seg-refs ; then
 		ewarn "You are using Xen but don't have -mno-tls-direct-seg-refs in your CFLAGS."
 		ewarn "This will result in a 50% performance penalty, which is probably not what you want."
 	fi
diff --git a/sys-libs/glibc/glibc-2.5.ebuild b/sys-libs/glibc/glibc-2.5.ebuild
index 381e063c098c..9f62bdf7d10a 100644
--- a/sys-libs/glibc/glibc-2.5.ebuild
+++ b/sys-libs/glibc/glibc-2.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.5.ebuild,v 1.14 2006/11/02 01:45:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.5.ebuild,v 1.15 2006/11/10 23:56:24 vapier Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -1033,7 +1033,7 @@ pkg_setup() {
 		die "nptlonly without nptl"
 	fi
 
-	if [[ -e /proc/xen ]] && ! is-flag -mno-tls-direct-seg-refs ; then
+	if [[ -e /proc/xen ]] && [[ $(tc-arch) == "x86" ]] && ! is-flag -mno-tls-direct-seg-refs ; then
 		ewarn "You are using Xen but don't have -mno-tls-direct-seg-refs in your CFLAGS."
 		ewarn "This will result in a 50% performance penalty, which is probably not what you want."
 	fi