summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /sys-apps/hwloc/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'sys-apps/hwloc/files')
-rw-r--r--sys-apps/hwloc/files/hwloc-1.8.1-gl.patch11
-rw-r--r--sys-apps/hwloc/files/hwloc-gather-topology-fix-lstopo-path-after-install.patch26
2 files changed, 37 insertions, 0 deletions
diff --git a/sys-apps/hwloc/files/hwloc-1.8.1-gl.patch b/sys-apps/hwloc/files/hwloc-1.8.1-gl.patch
new file mode 100644
index 000000000000..47daa9593377
--- /dev/null
+++ b/sys-apps/hwloc/files/hwloc-1.8.1-gl.patch
@@ -0,0 +1,11 @@
+--- hwloc-1.8.1/config/hwloc.m4.orig 2014-01-30 17:46:58.000000000 +0400
++++ hwloc-1.8.1/config/hwloc.m4 2014-02-27 13:46:28.587238873 +0400
+@@ -948,7 +948,7 @@
+ hwloc_gl_happy=no])
+
+ AC_CHECK_HEADERS([NVCtrl/NVCtrl.h], [
+- AC_CHECK_LIB([XNVCtrl], [XNVCTRLQueryTargetAttribute], [:], [hwloc_gl_happy=no], [-lXext])
++ AC_CHECK_LIB([XNVCtrl], [XNVCTRLQueryTargetAttribute], [:], [hwloc_gl_happy=no], [-lXext -lX11])
+ ], [hwloc_gl_happy=no])
+
+ if test "x$hwloc_gl_happy" = "xyes"; then
diff --git a/sys-apps/hwloc/files/hwloc-gather-topology-fix-lstopo-path-after-install.patch b/sys-apps/hwloc/files/hwloc-gather-topology-fix-lstopo-path-after-install.patch
new file mode 100644
index 000000000000..f383b3ab3a7a
--- /dev/null
+++ b/sys-apps/hwloc/files/hwloc-gather-topology-fix-lstopo-path-after-install.patch
@@ -0,0 +1,26 @@
+From 6d42748f8604f3c1d0ca6cf122e8776b3c153ac4 Mon Sep 17 00:00:00 2001
+From: Brice Goglin <Brice.Goglin@inria.fr>
+Date: Thu, 12 Mar 2015 10:01:13 +0100
+Subject: [PATCH] hwloc-gather-topology: fix lstopo path after install
+
+Broken when utils moved to utils/ subdirectories.
+
+(cherry picked from commit 0a32f719c48fb7dabf4882f8f2477017c25b15a9)
+---
+ NEWS | 1 +
+ tests/linux/Makefile.am | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/tests/linux/Makefile.am b/tests/linux/Makefile.am
+index f0a2f8a..27c261a 100644
+--- a/tests/linux/Makefile.am
++++ b/tests/linux/Makefile.am
+@@ -171,7 +171,7 @@ LOG_COMPILER = $(builddir)/test-topology.sh
+ bin_SCRIPTS = hwloc-gather-topology
+
+ install-exec-hook:
+- $(SED) -e 's/HWLOC_top_builddir\/utils/bindir/' -e '/HWLOC_top_builddir/d' $(DESTDIR)$(bindir)/hwloc-gather-topology > $(DESTDIR)$(bindir)/hwloc-gather-topology.tmp && mv -f $(DESTDIR)$(bindir)/hwloc-gather-topology.tmp $(DESTDIR)$(bindir)/hwloc-gather-topology
++ $(SED) -e 's/HWLOC_top_builddir\/utils\/lstopo/bindir/' -e '/HWLOC_top_builddir/d' $(DESTDIR)$(bindir)/hwloc-gather-topology > $(DESTDIR)$(bindir)/hwloc-gather-topology.tmp && mv -f $(DESTDIR)$(bindir)/hwloc-gather-topology.tmp $(DESTDIR)$(bindir)/hwloc-gather-topology
+ chmod +x $(DESTDIR)$(bindir)/hwloc-gather-topology
+
+ SUBDIRS = gather