Fix building as PIEs on x86 #456238 by Maxim Kammerer. Fix build of numastat #466108 by Lars Wendler.

Package-Manager: portage-2.2.0_alpha170/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

4 files changed, 95 insertions, 16 deletions

diff --git a/sys-process/numactl/ChangeLog b/sys-process/numactl/ChangeLog
index 6e825ad7e1a2..5fa5ec7c3a60 100644
--- a/sys-process/numactl/ChangeLog
+++ b/sys-process/numactl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-process/numactl
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/numactl/ChangeLog,v 1.27 2013/02/23 22:05:06 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/numactl/ChangeLog,v 1.28 2013/04/20 04:15:52 vapier Exp $
+
+*numactl-2.0.8-r1 (20 Apr 2013)
+
+  20 Apr 2013; Mike Frysinger <vapier@gentoo.org>
+  +files/numactl-2.0.8-cpuid-pic.patch, +numactl-2.0.8-r1.ebuild:
+  Fix building as PIEs on x86 #456238 by Maxim Kammerer.  Fix build of numastat
+  #466108 by Lars Wendler.
 
   23 Feb 2013; Agostino Sarubbo <ago@gentoo.org> numactl-2.0.7-r2.ebuild:
   Stable for ppc64, wrt bug #458206
diff --git a/sys-process/numactl/Manifest b/sys-process/numactl/Manifest
index 20384d0ed476..fe7f135183d3 100644
--- a/sys-process/numactl/Manifest
+++ b/sys-process/numactl/Manifest
@@ -1,9 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX numactl-2.0.2-build.patch 429 SHA256 fb5f82ff6e967e76ca10af59faada34518881273167df1cb7937940a6a50d390 SHA512 2c8ba0a34702cdb76eda7dfbd0123f11015db41e3904044103b9dce569dc472d43161ca250f28f5d230a5bee97f367a8cab89d3a53ec88d58c3e170d21f1630f WHIRLPOOL c8a62d5b13173c12fe9b695cbd6a9f8219107dea8523730e450f1e54b89a3a304a5caf8c8d9c0a9b33a479e4cef1990455327bdfdaff5121170fcf8bc7f2e2ed
 AUX numactl-2.0.5-protos.patch 228 SHA256 9508f0836d113ec1c6f3d89732861f6e1f7f920a34ad1230fe2d0488435d4b27 SHA512 964cfaf3d11413e26d901a515449c677c5d8109fa097c13ec2e9fa99c494b00894793bc086ac912aa068ed4460daeae44100bfd92f39a02aa1b9a5c5506431b1 WHIRLPOOL 05931803df6f842d2c1f82e782f0bfafce8e77f38f3bfeee7b9bf1b21733709ca55aefd232a0c41f4f7a975d77563d575b3c48f72421acc22f63d5f306f031dd
 AUX numactl-2.0.7-static_libs.patch 2609 SHA256 fd44628c1ac77266d3ad1107fd80bd85f44da91c7f77a1a299d5947e1fa9cb7a SHA512 b890b6684e116a233df51c74d7cdfa310e65e8af8cf7ffb60acb0bc48e912734cedc06fc841ef9d23f62dca030becee62488d06d3b7a301e059fc131278d45e5 WHIRLPOOL 193997f6dd832375946baef8536f598722b6d06513946ab5005a577e07546f8cad77580636b09d95f5d036ca7996d77b47775ce8214b657f14535cec949ff9c5
+AUX numactl-2.0.8-cpuid-pic.patch 697 SHA256 fc6d5e058ceb1953665fe67ec893a575b51c4cdd43a11117fb416bb88ad45459 SHA512 d9624110a7f8459c13b67eb990f05bc54ffe55818d586691b307dcc4ca5861f064a7269f1038cba5f8abf0f2b6d359d30e4f8d6e904a7e5c0da3404ef1bd4d51 WHIRLPOOL a59de11f4784636d618774f1a660eed3a534225e85881a036b13a59ec28823813b224081dffb9ab5870f7cf3bf4155bb0c92abc317dd3955fed8ab266f8d299d
 AUX numactl-2.0.8-static_libs.patch 2761 SHA256 ff8abe7defc4fde1f2bd380ccb0df3990ea57ddfcafd07cde6327820c667be16 SHA512 828dbcd719671c8ca81745d5670d48c071a8b353b9e42bbbaf9eeffd41b607a53ae24ddd6f0be422a2e6f61899635228da0926d7d8dedd143f52fde5bc5dbe05 WHIRLPOOL fd8f1dcc105b6cec190cd767a0c9bf2b3f556b541637e88c8ec718973732108bac3eec8cc1bcb5394c2f882b972b37d6234b016b2bbc3d8e1faa1372eb13e60c
 DIST numactl-2.0.2.tar.gz 70187 SHA256 9a675ac94267c5370b6016e57cd437211a6f5f456a6decb1f7973f602e1b44f1
 DIST numactl-2.0.5.tar.gz 78975 SHA256 afffcc0a237ec71737a3f3ecda5e0b4e0ede5c3a894af7d85f5416fa35f7b44c SHA512 baf57364979d208e9041856ac4ad8e2868a78d29ee46ba8b4a58074c260a1c7fec8e65e6a8e60d9f4c48994301e0b9a5d953b4bbb1632977424b58f63d5a95d0 WHIRLPOOL 8d4f244d3e535746b666fc9116c6660e0f41ab6713bf935e3a1b80078a3cd373bc09fc4e17d70f8a7ea295e8d5c06f51a61ab73a2ce568cd9cae14ee1d8bf395
@@ -13,23 +14,24 @@ EBUILD numactl-2.0.2.ebuild 1337 SHA256 79e55f8e717949b8510dca9c900a2d359477021e
 EBUILD numactl-2.0.5.ebuild 1340 SHA256 47bc06ec50a7eb689a3820e4aca0fe5efad7090e5ac46f52631164d9266dbb8f SHA512 f6e1ea5c3133dbd824b4a0ef25077faba559ba4739ddd4cbc692f65fcf4fcef47bf072a9e0a271464623efb9f6301ecf07665e7c914937f488c8597d97873197 WHIRLPOOL 48d5e6a4c5b70189766c123c7c485a01481902fdc9d8047273f8ec436bbf95c01b79c62bbe5272bcab3de104af48cd2891f3a62ce0326d5934a322870ad037a7
 EBUILD numactl-2.0.7-r2.ebuild 1463 SHA256 e579eff3251ad64d0dcd7670ad9aab411ce946691785060b9f5a7dd345ad50e2 SHA512 6511005bb4dcd4f74c56a4b310fd58cd0e24f289abd481d53e1ae7305c6cd56a344673fa18a7b7c06828bab482e1f459d576e7fefc68804526428d8db4960555 WHIRLPOOL 231e7d66438215b1a841ab496d28a6ad8567ae22e4c1c478799001dd565aae3e090e2d8eace20bc43cde9554e037313c3b14155ab6370cf0f3858d05938af277
 EBUILD numactl-2.0.7.ebuild 1255 SHA256 ab4288f89adc7e2abef9fb23ff7d3cbe28fb89860c5e906fbe9c7eaf8de336a6 SHA512 6643f2a9e59d4837c6aa7a6d3c41e90904a3ed2527560ee8a8fc4cac334a037ee58c3cde59c3f84e7336096a9cc5477a223c785decf35d8cf77e92eea6762999 WHIRLPOOL 5db29ad1db13eb71b4d7f05b8ef2f65637a792f001bf12ce1cebfd8ad55e1817f61a2ce5a47e8ac2534d2bb548dae7b0de4e277e911f7accf32f41062ebe213d
+EBUILD numactl-2.0.8-r1.ebuild 1521 SHA256 890e34900bbc74531c64bf64e472f0ed4c8d1c3a91a0656c05b3e3f0700a0fb7 SHA512 9a42e6f0bbb28446c88d2fe4151414cd77c69c0bed620a0a6875cfd1f3a8c0629484551028e49b75e9fc1059ce4fbaf3b1081b45446822fc9fe679503c7c584c WHIRLPOOL ec464e7d41e523cefbee54466519dc625bbd299e160b5189d498fb0a61f50f775878bf70a214ef89afaabb51c4dfe5175199bfe332cc38772b8877af2c10f634
 EBUILD numactl-2.0.8.ebuild 1536 SHA256 95dba6592aef403bdbe3f92efbd81c44aaa43b8d69014e1633867fb1ce513d0c SHA512 cc89e496edd45111577cb1125bb9e5ee901283987d8f1751dbcfb937bfb885b84754ef0c0ba4e39c4c26fbf7f80219ff36affa508ade1599c532a6dad688aa93 WHIRLPOOL aba96100360cef727996f73ff100e03ef1a969d098488618d167ffb18cfb05d62592b873e09f4699f5ac082da9b3a5575e0d6d26917baf0eabfa561adab6e476
-MISC ChangeLog 4108 SHA256 13b778ad224df8ed17bf2f6a8c5947af2ee76098238350fab5adf120bbcad0a2 SHA512 776649e355935ca2b83aad8339940337e869122369217cea7e41e6859c6fdf8912cf5c7e515322b268c485a54f6d4ffb28129f0480830a48f95bf2108678c376 WHIRLPOOL 30ea58f0792a2a9c894daaa270df49d2867aba3f3646a6b5f223505a4ae28584c3d0c6a40234307e7715accf6fc5ea8d884ed15d263a4937ba35254597247a7e
+MISC ChangeLog 4368 SHA256 48901a6606050969ee75c7cbc32f4125478ba209880ffd97ea9101fe3c0c3f8c SHA512 3e51f225cc7bbb38e1a6e2b2b4e5e9054b8071bde66463b6f17ffbfcb12988bf8a9fd740647ae1b1ca9fdb453b8c960c8b51e7359b47f4933ffd9d594b235cc5 WHIRLPOOL e6da3b5f8538b852ad4a75b9387903117f40b336cded38682070fd6125b9d3d974b11892fee8f7f4500d8e320020728b699bb85fd4d1193cc301dc37b49e65ab
 MISC metadata.xml 168 SHA256 436175a0fd4552a218e3474f07665550f601d21c541e64cc2564581021325a26 SHA512 0dc3684f07f73fe7e943a97f9f0e67f854751f58edc9fb3afd16851a672a7e5d44afe262ad9f4edcd4cb4f5755004b2b35fa468da4442edec5a91cb85f582d57 WHIRLPOOL 9d978491c3dbeed03838cbe8ba659c7a88395dd03a9f200178670a09b5d790f692bbdd1bc53e3a6ee9261d97920ec86e3525548b018a3e941fdf8a1c6e6ff1de
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRKTyNAAoJELp701BxlEWfBMsP/ine5Cu0Bv5C6y7HRaiuyH7f
-1re8w/m91si6Qkg8BzrfAXN4IBomyhdiC/TryQqhAf8JXuM5CVi3L2X7qJbBC593
-RRVtiez5xCPCiczBWpxacMT5BnQesuLHLUvfOLepyHSzAWSZZYqgevl8UKRAKmMu
-hno+hM/qG3zyNZ0d0ERMS3Wsha5k89qgFUw0bSuT0Yiin8wdiDKRDdDoyEtWkrTg
-Vh+71Hg2WH38NyaI8lCMp3yTXXdZ39Qc+jF1vdW2pC5XOIaf8GwrnSHf9Who6HCV
-9EyVRkcC3PTCYcWEoNmSRl5cFhWdAwo2jJRbsMDQ4L4tH1JnW42O/YJAlcHL1ZUS
-wfQQQHG3WNIPnaIh4/aoVURgw2Y/MFg/O0KSSpmk2Poc6eSDDHWpgum33yV8haa6
-U4FS6R4zOF16KRrRVYG42d/IKTSnfXW2zKhkaGgn2xwyygF+xGlwatrkio7nbZZg
-qj8NdOA/n2EOpVlgXbYY3Aqcovy8+O/KgM9bX8UFpA1gBotfXJCY92qVmIwxXkRx
-0nnL5cxeCIxl1cOiXUayCIbHxzdYrJyZ3KKn4fx0EkdsMKuN2JZGikKiZnboXNE0
-lb7Y+FB25w+DG3DbjgPuwRy30/Kx36/aW4IU1JHIu2hxabL+iPUo0hr/sOUFLHC8
-c/0RAhoj4vU/uAaCxyt0
-=+InN
+iQIcBAEBCAAGBQJRchcLAAoJELEHsLL7fEFWrVIP/RHvmRsWWiMifhu0u8k04BOW
+Fv1CrZpEgZQGP2qwBVkHWF2hbZnnmKbWNBZfM/5ZIvEmI+WpF0Ltzk1pNvETQMh/
+doIb5h6Id6ISUBC/JkPiTr3AlUOIIUz9WxxKDVZoT/cAQct3+N09xjsCHqeYoU3n
+tAW7jx5vKx2/JDbu4kS4ttiSZivWlp+TO41ig/fKkjyE8jOJ5qKmfDUI16xy9e9h
+/VVLk1PNH5rPPN+7EDDwp4FqtpkuvVQjSobIRDDn4SdlzA97rzd0fdJYtXuX9+Kt
+6g3NN+o54P1y5vX39JYSck6KGMGlr5QvEVrdtpUU68c5/K801M2RDIt/5KQMRxvL
+3iyeXzq3LCx+iCsGvySTstj74i97SnWf5weOky72UpzoLsLOJOOTBypJ8W4QxTdA
+59Nu0NS1nHDT+8uDQWseK3X3YY1OPIPU1NBB8lY/LJU9POoWW2UuFv8ng3DOa1VV
+jZotu+ayAZC9H7yDMdONOn8liHMr2b1El7vduXaiBg13JMWF0juZ2OGemkx4gwK4
+Z+lCroLCBoytxB3OJ5hDb7d9Sty9vZEarxAL+DgUbStJQnCPnD9dpALlLJgXh1aG
+dA+B6j7/SoneerUxADu72JIOhD0I8qJ2PvzGv2IUN3qhtapqMysa7BvkdHIfEAqH
+bAkiL/c2vzzspN7ABlVf
+=l3AG
 -----END PGP SIGNATURE-----
diff --git a/sys-process/numactl/files/numactl-2.0.8-cpuid-pic.patch b/sys-process/numactl/files/numactl-2.0.8-cpuid-pic.patch
new file mode 100644
index 000000000000..02e84b725772
--- /dev/null
+++ b/sys-process/numactl/files/numactl-2.0.8-cpuid-pic.patch
@@ -0,0 +1,17 @@
+make the code work on x86/PIC.  this code is only used in the demo,
+and the overhead of always running this is system noise, so don't
+bother bracketing with __i386__/__PIC__ defines.
+
+http://bugs.gentoo.org/456238
+
+--- a/clearcache.c
++++ b/clearcache.c
+@@ -57,7 +57,7 @@ void clearcache(unsigned char *mem, unsigned size)
+ #if defined(__i386__) || defined(__x86_64__)
+ 	unsigned i, cl, eax, feat;
+ 	/* get clflush unit and feature */
+-	asm("cpuid" : "=a" (eax), "=b" (cl), "=d" (feat) : "0" (1) : "cx");
++	asm("xchg %%ebx, %%esi; cpuid; xchg %%esi, %%ebx;" : "=a" (eax), "=S" (cl), "=d" (feat) : "0" (1) : "cx");
+ 	if (!(feat & (1 << 19)))
+ 		fallback_clearcache();
+ 	cl = ((cl >> 8) & 0xff) * 8;
diff --git a/sys-process/numactl/numactl-2.0.8-r1.ebuild b/sys-process/numactl/numactl-2.0.8-r1.ebuild
new file mode 100644
index 000000000000..1633f0496608
--- /dev/null
+++ b/sys-process/numactl/numactl-2.0.8-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/numactl/numactl-2.0.8-r1.ebuild,v 1.1 2013/04/20 04:15:52 vapier Exp $
+
+EAPI="4"
+
+inherit eutils toolchain-funcs multilib
+
+DESCRIPTION="Utilities and libraries for NUMA systems"
+HOMEPAGE="http://oss.sgi.com/projects/libnuma/"
+SRC_URI="ftp://oss.sgi.com/www/projects/libnuma/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+IUSE="static-libs"
+
+src_prepare() {
+	echo "printf $(get_libdir)" > getlibdir
+	epatch "${FILESDIR}"/${PN}-2.0.8-static_libs.patch
+	epatch "${FILESDIR}"/${PN}-2.0.8-cpuid-pic.patch #456238
+	rm numastat || die #466108
+}
+
+src_compile() {
+	emake \
+		AR="$(tc-getAR)" \
+		CC="$(tc-getCC)" \
+		RANLIB="$(tc-getRANLIB)" \
+		CFLAGS="${CFLAGS}" \
+		BENCH_CFLAGS="" \
+		THREAD_SUPPORT=$(tc-has-tls && echo yes || echo no) \
+		BUILD_STATIC=$(usex static-libs)
+}
+
+src_test() {
+	if [ -d /sys/devices/system/node ]; then
+		einfo "The only generically safe test is regress2."
+		einfo "The other test cases require 2 NUMA nodes."
+		cd test
+		./regress2 || die
+	else
+		ewarn "You do not have baseline NUMA support in your kernel, skipping tests."
+	fi
+}
+
+src_install() {
+	emake install prefix="${ED}/usr" BUILD_STATIC=$(usex static-libs)
+	# delete man pages provided by the man-pages package #238805
+	rm -rf "${ED}"/usr/share/man/man[25]
+	doman *.8 # makefile doesnt get them all
+	dodoc README TODO CHANGES DESIGN
+}