summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRick Farina <zerochaos@gentoo.org>2015-05-05 04:14:36 +0000
committerRick Farina <zerochaos@gentoo.org>2015-05-05 04:14:36 +0000
commitb63f08d0839f6bfa92552e7651343f6625e7c2fd (patch)
tree661c6ea1a07c60443ab259afd9af67dbcd323a7d
parentDrop 5.3 slot and remove sqlite2 USE description (diff)
downloadgentoo-2-b63f08d0839f6bfa92552e7651343f6625e7c2fd.tar.gz
gentoo-2-b63f08d0839f6bfa92552e7651343f6625e7c2fd.tar.bz2
gentoo-2-b63f08d0839f6bfa92552e7651343f6625e7c2fd.zip
fix for bug #502586
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key DD11F94A)
-rw-r--r--sys-process/numactl/ChangeLog6
-rw-r--r--sys-process/numactl/files/numactl-2.0.9-testsuite_path.patch14
-rw-r--r--sys-process/numactl/numactl-2.0.9.ebuild5
3 files changed, 22 insertions, 3 deletions
diff --git a/sys-process/numactl/ChangeLog b/sys-process/numactl/ChangeLog
index 4d5103e959bd..3d5d7ceb235d 100644
--- a/sys-process/numactl/ChangeLog
+++ b/sys-process/numactl/ChangeLog
@@ -1,6 +1,10 @@
# 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.41 2015/04/03 07:22:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/numactl/ChangeLog,v 1.42 2015/05/05 04:14:36 zerochaos Exp $
+
+ 05 May 2015; Rick Farina <zerochaos@gentoo.org>
+ +files/numactl-2.0.9-testsuite_path.patch, numactl-2.0.9.ebuild:
+ fix for bug #502586
03 Apr 2015; Mike Frysinger <vapier@gentoo.org> numactl-2.0.10-r2.ebuild:
Fix patch/autotools ordering #540856 by Arfrever Frehtes Taifersar Arahesis.
diff --git a/sys-process/numactl/files/numactl-2.0.9-testsuite_path.patch b/sys-process/numactl/files/numactl-2.0.9-testsuite_path.patch
new file mode 100644
index 000000000000..018fc6dbcd18
--- /dev/null
+++ b/sys-process/numactl/files/numactl-2.0.9-testsuite_path.patch
@@ -0,0 +1,14 @@
+diff -Naur numactl-2.0.10-orig/test/bind_range numactl-2.0.10/test/bind_range
+--- numactl-2.0.10-orig/test/bind_range 2015-05-03 22:23:31.095600314 -0400
++++ numactl-2.0.10/test/bind_range 2015-05-03 22:25:29.107592557 -0400
+@@ -93,8 +93,8 @@
+
+ HIGHESTCPU=$(grep 'processor' /proc/cpuinfo | tail -n1 | cut -f2 -d':')
+ HIGHESTCPU=$(echo $HIGHESTCPU | cut -f2 -d' ')
+-HIGHESTNODE=$(numactl -H | grep -e 'node [0-9]* cpus' | tail -n1 | cut -f2 -d' ')
+-LOWESTNODE=$(numactl -H | grep -e 'node [0-9]* cpus' | head -n1 | cut -f2 -d' ')
++HIGHESTNODE=$(../numactl -H | grep -e 'node [0-9]* cpus' | tail -n1 | cut -f2 -d' ')
++LOWESTNODE=$(../numactl -H | grep -e 'node [0-9]* cpus' | head -n1 | cut -f2 -d' ')
+
+ get_mask
+
diff --git a/sys-process/numactl/numactl-2.0.9.ebuild b/sys-process/numactl/numactl-2.0.9.ebuild
index 9add938a61b0..5bf21a7cf85c 100644
--- a/sys-process/numactl/numactl-2.0.9.ebuild
+++ b/sys-process/numactl/numactl-2.0.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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.9.ebuild,v 1.7 2014/06/25 17:46:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/numactl/numactl-2.0.9.ebuild,v 1.8 2015/05/05 04:14:36 zerochaos Exp $
EAPI="4"
@@ -21,6 +21,7 @@ src_prepare() {
epatch "${FILESDIR}"/${PN}-2.0.8-static_libs.patch
epatch "${FILESDIR}"/${PN}-2.0.8-cpuid-pic.patch #456238
epatch "${FILESDIR}"/${PN}-2.0.9-testsuite_fix.patch
+ epatch "${FILESDIR}"/${P}-testsuite_path.patch
rm numastat || die #466108
}