Respect user CFLAGS when building numademo #540856 by Arfrever Frehtes Taifersar Arahesis.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

4 files changed, 89 insertions, 9 deletions

diff --git a/sys-process/numactl/ChangeLog b/sys-process/numactl/ChangeLog
index 093a30a877ca..bfaa9fcbc33e 100644
--- a/sys-process/numactl/ChangeLog
+++ b/sys-process/numactl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-process/numactl
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/numactl/ChangeLog,v 1.39 2015/02/20 02:47:47 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/numactl/ChangeLog,v 1.40 2015/04/03 06:10:07 vapier Exp $
+
+*numactl-2.0.10-r2 (03 Apr 2015)
+
+  03 Apr 2015; Mike Frysinger <vapier@gentoo.org>
+  +files/numactl-2.0.10-numademo-cflags.patch, +numactl-2.0.10-r2.ebuild:
+  Respect user CFLAGS when building numademo #540856 by Arfrever Frehtes
+  Taifersar Arahesis.
 
 *numactl-2.0.10-r1 (20 Feb 2015)
 
diff --git a/sys-process/numactl/Manifest b/sys-process/numactl/Manifest
index daae56839e80..10aeffda2e25 100644
--- a/sys-process/numactl/Manifest
+++ b/sys-process/numactl/Manifest
@@ -1,24 +1,32 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX numactl-2.0.10-numademo-cflags.patch 504 SHA256 fd1b3cc3f03155269f52f4e4beda67221993104315eaef413fb83f271e98cd1b SHA512 15266d98c375241fd84146a010f329265644666ab90d517865675618a8f793ea6bdc39e7c8b64836fa5b393afad1cd3c89452e838d751adbb315668a2cd29b78 WHIRLPOOL 8d8313bb7d4423e4008bd755c268a658bd88a40a33956afc26134bcf18b21e5f0283a68d36a45af48a8f06a8bdd9b216e2dc55c1c037da405860bfb3367cf3c8
 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
 AUX numactl-2.0.9-testsuite_fix.patch 262 SHA256 2b857d892f99fb93e2fb961ac08f054d60b0c9a93331226e866d6bb66b7c4417 SHA512 8b9d952076eb04f0093d25c87f25e3f68f9a02a96daa4b574414f75092ded757fd587419584e8ea1883c0881aa2d462cf04904a479c0a925784e111e4b95a6c8 WHIRLPOOL 9d996e854e68d610658e0a0853ee4be9ea5aa30dc4ced8db0a55689c5d8d3235af54102744704b0480d1d8213f814dbe5b8792479ac7e90cce1de2597747bb02
 DIST numactl-2.0.10.tar.gz 98999 SHA256 9d197fefac81c73dc2b2e554f1758b2ec56d4e9b2f04a7f45dff5d6cb14fb9ce SHA512 3a82b28bbc724a2340950ac33396055da852ee06e5b1d3414cd83dd6f9e26fbb648faae35ce4009c76d6a180f3067a8f3fb18e3ffaa6b6db68adfc0877e94975 WHIRLPOOL 59a172c14d96b01b1e13d2913f6f820d4f9bacb2f80e2920d4350273ff01ab57d56ab4a163fde2df3898c4b7cf204bd4a333c99f9feb9d5bcd89fea799a3d2db
 DIST numactl-2.0.9.tar.gz 341455 SHA256 9ca033e6c14c0f26c20379b0cf9299429fd5a354a79c3c7880fd41ef69f7751c SHA512 483cbb1607da0f3bf0923202ea565100ea430b19502bdbd322f043f75dc945cc0f47878c0ed28badab23561c37da0b04aa12d07656bb4666c4f8d02a0d256407 WHIRLPOOL 5aba5b4a6ab0a4f06a2266054fdc7be8ca81696cf417e4fa4d10667ab95195edc5e002551a3bda4ea1eb25caf01d171ed18a16e4c29960902546aa78d7b93d73
 EBUILD numactl-2.0.10-r1.ebuild 1389 SHA256 5629b7f55ae4e8e24eb724e9d0b2c109bf57c1c265d48f965e635888868e7a67 SHA512 f88891e85631d090b506e52600d0a362b7966305a7bf7191b9a4678eb56f1a08eaf37031355dd688e40febf18699c7217be0b6d25c2f39f8f859a406c50c206f WHIRLPOOL a39f9d6c99df4c6fae850ee437a68c3c8862f2f40ae1ed33a41eb900b6e9a7f4cb586d09c5f1812cbf2633589f32324a36fe2522433cf3dcde551a0fd41651ab
+EBUILD numactl-2.0.10-r2.ebuild 1454 SHA256 85a0456518d26812fb966b39b9a3058a7075bcc0381e219aa599043978603875 SHA512 01f0562f2de1696f8a5947338c3e37f9ef52138a500ab28a19bbe6eb7a8ac0ceb2ce61f0990a998aa436b54ae00dbbc861614b4b2ddd5ce76b736b3392602461 WHIRLPOOL 61ee3c27c97fb0395face7cee37b06ba780c635856ff0988d4a515d1cf6a155cf08a4d1416408949d152a7cd56a9de04defcaf71df1a12c5587a06326d6bc0b1
 EBUILD numactl-2.0.10.ebuild 1124 SHA256 38623ee37c72aa42630f28b26ab2cd4cecd7f3da3723f83315b5d49484f94c51 SHA512 75173c0981932d2c04a4e592ca587cf0c4bed6ef9cf169d91dae30892fab7b5ae708deb680228de42ab83a24fb40f3bd299e99d468209f6501ffef2cd2d92cc2 WHIRLPOOL 31985f4eafe08a0314be681d33fb779a78feeec27b7330d1a8bc1936561dcc54d7d0dfee7d51fd5e160902511a20f0c96254fb3a3ae4b0ec6745f2959012042b
 EBUILD numactl-2.0.9.ebuild 1623 SHA256 54faa94fed3daa3afb0e4788a95eb12c3a013359db4697fb40c9b9351072b231 SHA512 2581d213395cc4cebffcedcbf5c25a0a5772aa8f49274a1456653c7e06603ecdf4f33f8784184cb5d88f8d9b3635ae3247efa0f884e1572a6b4913f777dd288c WHIRLPOOL 86cf9001e6d451ca7ffe2a079839cbdcb9b067c864df7cb32527f9f0f7f250e620f898c8bd0abe1bde5edaa0b7ae1e4bad7f42392e7ab75a3d43dd6669eb7ff1
-MISC ChangeLog 5945 SHA256 edcb75dbc8339ea6602ec170742d6b145058c9e6a1ab594f7d1ffc594512bc48 SHA512 b707e6c54f480fd52cebd51b1f63bd2d6f51ab83180c0f439da151fa956fc3ee010199c4dfd612ee027c389d234216657be0731affcba38f811d56ecd51c5b6f WHIRLPOOL 8f7c8bf3e803bd19d53c83db08bf7b4ece24ce894e5ebefc4be4237a0ac955a4e33122525211f83bf8c709b0283f6c9fc916ea1ea9020638ca26bed54e33fead
+MISC ChangeLog 6199 SHA256 6bd10d98da51db9a70fe7ffe8835289f0e9281c8e6c97839260f144fc36f6408 SHA512 444c9c0f8e2100e5079a48e52bae7b8b5d13808967dd38ea0dac87c53fe0dbb37d2494be0e99d054a97e487471f720301f394e2b23c5db4fce838b1336d8304d WHIRLPOOL f778c8362ce900cfa17a9eb3f2c8c013f7d69c70f99d076185233ca79079ccbec7c8b8919a646c5e5dbf9c6b15c18123b8c3a22e044840ed233deb216fd273eb
 MISC metadata.xml 166 SHA256 a33d3505ea834e19cd196ef8af9d438f1e476abb2aca27b0ea9f1219e93b8b26 SHA512 9a924987983984221311fc13539b270e032c8a18bfb2e863480dd4be10d36f3ec22d6824cc443c4dcbd34a6a0abce33ba70eeb90766122e072d442216af4f8dc WHIRLPOOL c28ad7db1ab0447a86899c0b1e504795754cc1ac75250e1b81ddb3ea1ea318abdeca1712695d18f8a12ff8b72e73b4cefef35adc05eb15a448aff88e7bd4b330
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJU5qBVAAoJEOeBhlrCAAWGPswH/As61PCJJm3W7lW5PrhG4ejx
-aSqa0wf3bjJxgIoZ6ej9UmCnwZK4YIlM4Ol9Dfn8+OYK5wLXBLIvZpdhPUihn7fP
-QDZ814ABUXN+WRQhxfsXjD2KyiWSkTpaEWBq5nHQp0nXmUkW4bIcM/kVhAtqJxdw
-Es1LJSnua93n7HGQA6gks/mGHzmUtR4/YuzkcJRULnGaMWZic1PLnL4YXDClnPbj
-KbF0qJfCvCyB6/KXwe18BiO9ay+6cGiiFlUw+P2sw2UIK4k+6mo73wFPsBTjBolP
-Pd8BaDX27kH6xfR2KUA3DS6pbyL8CAGvfon8Za0MmVvx55DTAV7xbooEohMGI0Y=
-=CKa+
+iQIcBAEBCAAGBQJVHi7BAAoJEPGu1DbS6WIASjkP/2cxU3q0aZNKSvUc6Bo0Melj
+R+7Mwd6GfPnxcpXcVcBtlcuyG1dLDqLCkrT36uuk3Fi2NqHzFPB9b5V2ZDVbcia8
+Sp+zjW7x1KPaX73TL/qIk9CHrZpHM6NUwOo/X8wdYMa3EpMybHGJPm4+0QEuCCFo
+JzKdcQXwK6Mnik+9G9CzGz/YH5cYHDHbaptYkwrFplaW8jgCRvbeD3Ez50X18Qe1
+hTSYgPjZp+UmD4LOQel8Dcw3117Onenqj1PMVx5GSlfLEv0tgiSy19wz4iK2YJxb
+7QEC+JAv8m3pGjsKw3FI9AVv4Ciz+LnAaf4jU5GdpizdyvmFovVuBkevP/jgGNyo
+QaXv+Nz6oP1pBmJcOrEGnfMPamxJvkM5PHR2s27TuA8tghnSW2+zd9St5sXTXWiN
+WtxaGcDZZpeI95vL4PiULMg+y673D4wtjRaQwyOWRlcoRl7nWpK6hBQhhkKgT6LB
+wFGhCf6Wz41ANPI+Rh3nXSzXenm6ox2LMBwZIPWE3aNo6gUCoKvboPxsQSkPf0b1
+5WX1OcOZ4kj71i8xyg21BC3ebvJUHe4qoGIiEYbWJ3damkCq+MCEYrLS4Itml8S8
+8CMXmFNBNzXOLpmjxpHoNiCdWDy3Ct0zQuIJ0Kt713Nc8xCGbRWX4hHbVP0K4r+r
+PFhHzsfp6SROC/A0UwlO
+=tpIe
 -----END PGP SIGNATURE-----
diff --git a/sys-process/numactl/files/numactl-2.0.10-numademo-cflags.patch b/sys-process/numactl/files/numactl-2.0.10-numademo-cflags.patch
new file mode 100644
index 000000000000..9b318df5a5ca
--- /dev/null
+++ b/sys-process/numactl/files/numactl-2.0.10-numademo-cflags.patch
@@ -0,0 +1,15 @@
+https://bugs.gentoo.org/540856
+
+respect user CFLAGS
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -23,7 +23,7 @@ numastat_CFLAGS = $(AM_CFLAGS) -std=gnu99
+ 
+ numademo_SOURCES = numademo.c stream_lib.c stream_lib.h mt.c mt.h clearcache.c clearcache.h
+ numademo_CPPFLAGS = $(AM_CPPFLAGS) -DHAVE_STREAM_LIB -DHAVE_MT -DHAVE_CLEAR_CACHE
+-numademo_CFLAGS = -O3 -ffast-math -funroll-loops
++numademo_CFLAGS = $(AM_CFLAGS) -ffast-math -funroll-loops
+ if HAVE_TREE_VECTORIZE
+ numademo_CFLAGS += -ftree-vectorize
+ endif
diff --git a/sys-process/numactl/numactl-2.0.10-r2.ebuild b/sys-process/numactl/numactl-2.0.10-r2.ebuild
new file mode 100644
index 000000000000..f286d971c3b6
--- /dev/null
+++ b/sys-process/numactl/numactl-2.0.10-r2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/numactl/numactl-2.0.10-r2.ebuild,v 1.1 2015/04/03 06:10:07 vapier Exp $
+
+EAPI=5
+
+inherit autotools eutils toolchain-funcs multilib-minimal
+
+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"
+# ARM lacks the __NR_migrate_pages syscall.
+KEYWORDS="~amd64 -arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+IUSE=""
+
+ECONF_SOURCE=${S}
+
+src_prepare() {
+	eautoreconf
+	epatch "${FILESDIR}"/${PN}-2.0.8-cpuid-pic.patch #456238
+	epatch "${FILESDIR}"/${PN}-2.0.10-numademo-cflags.patch #540856
+}
+
+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."
+		emake regress2
+	else
+		ewarn "You do not have baseline NUMA support in your kernel, skipping tests."
+	fi
+}
+
+multilib_src_compile() {
+	multilib_is_native_abi && default || emake libnuma.la
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install$(multilib_is_native_abi || echo "-libLTLIBRARIES install-includeHEADERS")
+}
+
+multilib_src_install_all() {
+	DOCS=( README TODO CHANGES DESIGN )
+	einstalldocs
+	# delete man pages provided by the man-pages package #238805
+	rm -r "${ED}"/usr/share/man/man[25] || die
+}