Fix linking order #248444 by Diego E. Pettenò.

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

4 files changed, 42 insertions, 22 deletions

diff --git a/sys-process/numactl/ChangeLog b/sys-process/numactl/ChangeLog
index a360e6cb640f..c751791c5614 100644
--- a/sys-process/numactl/ChangeLog
+++ b/sys-process/numactl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-process/numactl
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/numactl/ChangeLog,v 1.8 2008/09/29 23:40:12 vapier Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/numactl/ChangeLog,v 1.9 2009/02/08 19:54:31 vapier Exp $
+
+  08 Feb 2009; Mike Frysinger <vapier@gentoo.org>
+  +files/numactl-2.0.2-build.patch, numactl-2.0.2.ebuild:
+  Fix linking order #248444 by Diego E. Pettenò.
 
 *numactl-2.0.2 (29 Sep 2008)
 
diff --git a/sys-process/numactl/Manifest b/sys-process/numactl/Manifest
index 2dc0d46e9b45..25491b32ad65 100644
--- a/sys-process/numactl/Manifest
+++ b/sys-process/numactl/Manifest
@@ -1,18 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX numactl-0.9.11-make-jobs.patch 510 RMD160 4dc7280f3158ab7142b054e806ebdd031fd02dd0 SHA1 70955346e0bebf839e60ea884527e06ddae80a11 SHA256 797865df76b78445ba54e19933c79c62add0e6e525dabbd0213aff45a9543559
-AUX numactl-1.0.2-migrate_pages-fix.diff 1167 RMD160 f60c3d35596127033a406783e6b297ad8ef72336 SHA1 daeac2c03529457925bcbe76a0d0696f261f0e0e SHA256 0cc93edf0981fb0f8a6dab9200def275223c2e379b3ef0c8c1e2aa45f7ba04ea
-DIST numactl-1.0.2.tar.gz 49927 RMD160 775fcc70348f54c57c3cfa152643d58ec8010f58 SHA1 ebb439ca05d5cf91748f9d5525169e07940ab126 SHA256 328ca8a25dc6ded2f8a4e28134f587a13b95aedf7cd0d6836c2a33a40ecc7941
+AUX numactl-2.0.2-build.patch 429 RMD160 3149ef4e8d1ea6ced276274c6e2a50bfd3605b52 SHA1 eb84cc657294cbc5a6109595cb44a5581d0acf52 SHA256 fb5f82ff6e967e76ca10af59faada34518881273167df1cb7937940a6a50d390
 DIST numactl-2.0.2.tar.gz 70187 RMD160 72ef94e604a1162117d70df60cab5e38f2235961 SHA1 3f70f6ef037584dcd5f5d26e7407d5465a866b81 SHA256 9a675ac94267c5370b6016e57cd437211a6f5f456a6decb1f7973f602e1b44f1
-EBUILD numactl-1.0.2.ebuild 1142 RMD160 670625d959996f82d56ce752f9602bd348391bfe SHA1 2d62f464c91e4bfb109e4eaf8d507a922a96f033 SHA256 e264f06351ce62fcb34fb84d7a902a36db0f9c76d17cfde11ddc4b03853a6453
-EBUILD numactl-2.0.2.ebuild 1128 RMD160 71b803f3ef720611fc04252ecdd1033d8c98a027 SHA1 5bc072dba59a9084813f97f3f7f6d342a02066aa SHA256 d16ed46f1d1a2a5f1ca13cc1b780e4d7b58c4f4662dc674db0d8d8503bcf664c
-MISC ChangeLog 1544 RMD160 01720b8a5122f757ef6c0bc8946050f59b08955d SHA1 c5daee014796d2f7e67e6b7b988b0ddea8cd4f66 SHA256 0f582af34f97e8aafc479add4622f3aad62098b0e9698e7864cef6bd12f63a5e
+EBUILD numactl-2.0.2.ebuild 1203 RMD160 0b6841f11158f76a6544bca89f24edecfc71150e SHA1 56e6c1034cdeca6c671ab91223c7aa316c409fee SHA256 b16f09c726772213fbef4004a2ab35b1da194e3ac9d2bdbe29c2a5e7c3890cdc
+MISC ChangeLog 1703 RMD160 f0c0733e26cce93327d3adcb74a9a95076d2f8a1 SHA1 c7b8bf4c4fe90b1a997817fe5abfb0015cdc6114 SHA256 6011143084b798e944eea9f3265390db3d3a1b41d170a3a27f85358248ec871b
 MISC metadata.xml 168 RMD160 b985d73a0da9e38afe23c1061e6113fc28971119 SHA1 48145e0b5071fdd7ff3cf1f699253c04106b246a SHA256 436175a0fd4552a218e3474f07665550f601d21c541e64cc2564581021325a26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkjhZ2MACgkQ67wieSYcaxdaVwCfVrNBBHV1YTkSYgK6YBeYD3m4
-ZCEAoK9dGr+bo4M/Pp3ZhiE0hCsRf1JQ
-=TSOF
+iEYEARECAAYFAkmPOH0ACgkQn/5bYzqsSmGZOwCggb41LRRHCMojDamtXtcgbXrP
+I5sAnjPEzA/ALJhjq1ShujAd/R5hkX5E
+=bCQy
 -----END PGP SIGNATURE-----
diff --git a/sys-process/numactl/files/numactl-2.0.2-build.patch b/sys-process/numactl/files/numactl-2.0.2-build.patch
new file mode 100644
index 000000000000..acb04b8ab81b
--- /dev/null
+++ b/sys-process/numactl/files/numactl-2.0.2-build.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile b/Makefile
+index 3795115..28a9418 100755
+--- a/Makefile
++++ b/Makefile
+@@ -57,7 +57,7 @@ memhog: util.o memhog.o libnuma.so
+ 
+ numactl.o: numactl.c
+ 
+-numademo: override LDFLAGS += -lm
++numademo: LDLIBS += -lm
+ # GNU make 3.80 appends BENCH_CFLAGS twice. Bug? It's harmless though.
+ numademo: CFLAGS += -DHAVE_STREAM_LIB -DHAVE_MT -DHAVE_CLEAR_CACHE ${BENCH_CFLAGS}
+ stream_lib.o: CFLAGS += ${BENCH_CFLAGS}
diff --git a/sys-process/numactl/numactl-2.0.2.ebuild b/sys-process/numactl/numactl-2.0.2.ebuild
index 7bc480a04847..e8b5d26c6b44 100644
--- a/sys-process/numactl/numactl-2.0.2.ebuild
+++ b/sys-process/numactl/numactl-2.0.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/numactl/numactl-2.0.2.ebuild,v 1.1 2008/09/29 23:40:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/numactl/numactl-2.0.2.ebuild,v 1.2 2009/02/08 19:54:31 vapier Exp $
 
-inherit base eutils toolchain-funcs
+inherit eutils toolchain-funcs
 
-DESCRIPTION="Utilities and libraries for NUMA systems."
+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"
 
@@ -15,10 +15,23 @@ IUSE="perl"
 
 RDEPEND="perl? ( dev-lang/perl )"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-build.patch
+}
+
 src_compile() {
 	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" BENCH_CFLAGS="" || die
 }
 
+src_test() {
+	einfo "The only generically safe test is regress2."
+	einfo "The other test cases require 2 NUMA nodes."
+	cd test
+	./regress2 || die "regress2 failed!"
+}
+
 src_install() {
 	emake install prefix="${D}/usr" || die
 	# delete man pages provided by the man-pages package #238805
@@ -29,10 +42,3 @@ src_install() {
 		rm "${D}"/usr/bin/numastat "${D}"/usr/share/man/man8/numastat.8 || die
 	fi
 }
-
-src_test() {
-	einfo "The only generically safe test is regress2."
-	einfo "The other test cases require 2 NUMA nodes."
-	cd test
-	./regress2 || die "regress2 failed!"
-}