public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/sci:master commit in: sys-apps/hwloc/
@ 2015-02-17 15:39 Christoph Junghans
  0 siblings, 0 replies; 6+ messages in thread
From: Christoph Junghans @ 2015-02-17 15:39 UTC (permalink / raw
  To: gentoo-commits

commit:     27a276db753d537aa650f9f2b0429542ce687a49
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 17 15:39:29 2015 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Tue Feb 17 15:39:29 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=27a276db

use multilib nvidia-cuda-toolkit

Package-Manager: portage-2.2.14

---
 sys-apps/hwloc/ChangeLog              | 3 +++
 sys-apps/hwloc/hwloc-1.10.0-r2.ebuild | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/sys-apps/hwloc/ChangeLog b/sys-apps/hwloc/ChangeLog
index ef85758..58a8b1e 100644
--- a/sys-apps/hwloc/ChangeLog
+++ b/sys-apps/hwloc/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sys-apps/hwloc/ChangeLog,v 1.49 2015/01/05 17:56:52 aballier Exp $
 
+  17 Feb 2015; Christoph Junghans <ottxor@gentoo.org> hwloc-1.10.0-r2.ebuild:
+  use multilib nvidia-cuda-toolkit
+
   05 Jan 2015; Alexis Ballier <aballier@gentoo.org> hwloc-1.10.0-r1.ebuild:
   keyword ~arm
 

diff --git a/sys-apps/hwloc/hwloc-1.10.0-r2.ebuild b/sys-apps/hwloc/hwloc-1.10.0-r2.ebuild
index 0d98083..96c09a9 100644
--- a/sys-apps/hwloc/hwloc-1.10.0-r2.ebuild
+++ b/sys-apps/hwloc/hwloc-1.10.0-r2.ebuild
@@ -18,6 +18,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x8
 IUSE="cairo cuda debug gl +numa opencl +pci plugins svg static-libs xml X"
 
 # TODO opencl only works with AMD so no virtual
+# dev-util/nvidia-cuda-toolkit is always multilib
 
 RDEPEND=">=sys-libs/ncurses-5.9-r3[${MULTILIB_USEDEP}]
 	cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg?,${MULTILIB_USEDEP}] )
@@ -54,7 +55,7 @@ multilib_src_configure() {
 		--disable-silent-rules
 		--docdir="${EPREFIX}"/usr/share/doc/${PF}
 		$(use_enable cairo)
-		$(multilib_native_use_enable cuda)
+		$(use_enable cuda)
 		$(use_enable debug)
 		$(multilib_native_use_enable gl)
 		$(multilib_native_use_enable opencl)


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sys-apps/hwloc/
@ 2015-02-17 21:21 Christoph Junghans
  0 siblings, 0 replies; 6+ messages in thread
From: Christoph Junghans @ 2015-02-17 21:21 UTC (permalink / raw
  To: gentoo-commits

commit:     c42f2d956ebf8e5fe5b84cc9129c83dd90c5e387
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 17 21:13:00 2015 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Tue Feb 17 21:13:00 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=c42f2d95

filter -ftracer

Package-Manager: portage-2.2.14

---
 sys-apps/hwloc/ChangeLog              | 3 +++
 sys-apps/hwloc/hwloc-1.10.0-r2.ebuild | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/sys-apps/hwloc/ChangeLog b/sys-apps/hwloc/ChangeLog
index 58a8b1e..c9c35fc 100644
--- a/sys-apps/hwloc/ChangeLog
+++ b/sys-apps/hwloc/ChangeLog
@@ -3,6 +3,9 @@
 # $Header: /var/cvsroot/gentoo-x86/sys-apps/hwloc/ChangeLog,v 1.49 2015/01/05 17:56:52 aballier Exp $
 
   17 Feb 2015; Christoph Junghans <ottxor@gentoo.org> hwloc-1.10.0-r2.ebuild:
+  filter -ftracer
+
+  17 Feb 2015; Christoph Junghans <ottxor@gentoo.org> hwloc-1.10.0-r2.ebuild:
   use multilib nvidia-cuda-toolkit
 
   05 Jan 2015; Alexis Ballier <aballier@gentoo.org> hwloc-1.10.0-r1.ebuild:

diff --git a/sys-apps/hwloc/hwloc-1.10.0-r2.ebuild b/sys-apps/hwloc/hwloc-1.10.0-r2.ebuild
index 96c09a9..3461c5b 100644
--- a/sys-apps/hwloc/hwloc-1.10.0-r2.ebuild
+++ b/sys-apps/hwloc/hwloc-1.10.0-r2.ebuild
@@ -46,6 +46,8 @@ src_prepare() {
 		append-cppflags -I/opt/cuda/include
 		append-ldflags -L/opt/cuda/$(get_libdir)
 	fi
+	#fails with -ftracer in CFLAGS, see #540036#c7
+	filter-flags -ftracer
 	autotools-utils_src_prepare
 }
 


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sys-apps/hwloc/
@ 2015-02-17 21:21 Christoph Junghans
  0 siblings, 0 replies; 6+ messages in thread
From: Christoph Junghans @ 2015-02-17 21:21 UTC (permalink / raw
  To: gentoo-commits

commit:     052d61fd98cb66e3c4e030e359564e4ff7dee920
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 17 21:20:36 2015 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Tue Feb 17 21:20:36 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=052d61fd

version bump

Package-Manager: portage-2.2.14

---
 sys-apps/hwloc/ChangeLog                                       | 6 ++++++
 sys-apps/hwloc/{hwloc-1.10.0-r2.ebuild => hwloc-1.10.1.ebuild} | 2 --
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/sys-apps/hwloc/ChangeLog b/sys-apps/hwloc/ChangeLog
index c9c35fc..1f9a497 100644
--- a/sys-apps/hwloc/ChangeLog
+++ b/sys-apps/hwloc/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sys-apps/hwloc/ChangeLog,v 1.49 2015/01/05 17:56:52 aballier Exp $
 
+*hwloc-1.10.1 (17 Feb 2015)
+
+  17 Feb 2015; Christoph Junghans <ottxor@gentoo.org> +hwloc-1.10.1.ebuild,
+  -hwloc-1.10.0-r2.ebuild:
+  version bump
+
   17 Feb 2015; Christoph Junghans <ottxor@gentoo.org> hwloc-1.10.0-r2.ebuild:
   filter -ftracer
 

diff --git a/sys-apps/hwloc/hwloc-1.10.0-r2.ebuild b/sys-apps/hwloc/hwloc-1.10.1.ebuild
similarity index 96%
rename from sys-apps/hwloc/hwloc-1.10.0-r2.ebuild
rename to sys-apps/hwloc/hwloc-1.10.1.ebuild
index 3461c5b..96c09a9 100644
--- a/sys-apps/hwloc/hwloc-1.10.0-r2.ebuild
+++ b/sys-apps/hwloc/hwloc-1.10.1.ebuild
@@ -46,8 +46,6 @@ src_prepare() {
 		append-cppflags -I/opt/cuda/include
 		append-ldflags -L/opt/cuda/$(get_libdir)
 	fi
-	#fails with -ftracer in CFLAGS, see #540036#c7
-	filter-flags -ftracer
 	autotools-utils_src_prepare
 }
 


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sys-apps/hwloc/
@ 2015-02-18 16:41 Justin Lecher
  0 siblings, 0 replies; 6+ messages in thread
From: Justin Lecher @ 2015-02-18 16:41 UTC (permalink / raw
  To: gentoo-commits

commit:     df0129c246343653050130a98899bbdb0cc61f91
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 18 14:32:31 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Feb 18 14:32:31 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=df0129c2

sys-apps/hwloc: fix SLOT operators

Package-Manager: portage-2.2.17

---
 sys-apps/hwloc/ChangeLog           |  4 ++++
 sys-apps/hwloc/hwloc-1.10.1.ebuild |  2 +-
 sys-apps/hwloc/metadata.xml        | 20 ++++++++++----------
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/sys-apps/hwloc/ChangeLog b/sys-apps/hwloc/ChangeLog
index 1f9a497..f444a2f 100644
--- a/sys-apps/hwloc/ChangeLog
+++ b/sys-apps/hwloc/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sys-apps/hwloc/ChangeLog,v 1.49 2015/01/05 17:56:52 aballier Exp $
 
+  18 Feb 2015; Justin Lecher <jlec@gentoo.org> hwloc-1.10.1.ebuild,
+  metadata.xml:
+  sys-apps/hwloc: fix SLOT operators
+
 *hwloc-1.10.1 (17 Feb 2015)
 
   17 Feb 2015; Christoph Junghans <ottxor@gentoo.org> +hwloc-1.10.1.ebuild,

diff --git a/sys-apps/hwloc/hwloc-1.10.1.ebuild b/sys-apps/hwloc/hwloc-1.10.1.ebuild
index 96c09a9..262a764 100644
--- a/sys-apps/hwloc/hwloc-1.10.1.ebuild
+++ b/sys-apps/hwloc/hwloc-1.10.1.ebuild
@@ -24,7 +24,7 @@ RDEPEND=">=sys-libs/ncurses-5.9-r3[${MULTILIB_USEDEP}]
 	cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg?,${MULTILIB_USEDEP}] )
 	cuda? ( dev-util/nvidia-cuda-toolkit )
 	gl? ( media-video/nvidia-settings )
-	opencl? ( x11-drivers/ati-drivers )
+	opencl? ( x11-drivers/ati-drivers:* )
 	pci? (
 		>=sys-apps/pciutils-3.3.0-r2[${MULTILIB_USEDEP}]
 		>=x11-libs/libpciaccess-0.13.1-r1[${MULTILIB_USEDEP}]

diff --git a/sys-apps/hwloc/metadata.xml b/sys-apps/hwloc/metadata.xml
index 1c247ac..22128ee 100644
--- a/sys-apps/hwloc/metadata.xml
+++ b/sys-apps/hwloc/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cluster</herd>
-<longdescription> 
+  <herd>cluster</herd>
+  <longdescription>
   The Portable Hardware Locality (hwloc) software package provides a portable abstraction 
   (across OS, versions, architectures, ...) of the hierarchical topology of modern architectures, 
   including NUMA memory nodes, sockets, shared caches, cores and simultaneous multithreading. 
@@ -10,12 +10,12 @@
   It primarily aims at helping applications with gathering information about modern computing 
   hardware so as to exploit it accordingly and efficiently.
 </longdescription>
-<use>
-  <flag name='cuda'>Enable CUDA device discovery</flag>
-  <flag name='gl'>Enable GL display device discovery (NVCtrl)</flag>
-  <flag name='numa'>Add support for numa memory allocation</flag>
-  <flag name='opencl'>Enable OpenCL device discovery (AMD only)</flag>
-  <flag name='pci'>Enable PCI device discovery using libpci</flag>
-  <flag name='plugins'>Build hwloc components as plugins so that the hwloc core library does not directly depend on their dependencies (for instance the libpci library)</flag>
-</use>
+  <use>
+    <flag name="cuda">Enable CUDA device discovery</flag>
+    <flag name="gl">Enable GL display device discovery (NVCtrl)</flag>
+    <flag name="numa">Add support for numa memory allocation</flag>
+    <flag name="opencl">Enable OpenCL device discovery (AMD only)</flag>
+    <flag name="pci">Enable PCI device discovery using libpci</flag>
+    <flag name="plugins">Build hwloc components as plugins so that the hwloc core library does not directly depend on their dependencies (for instance the libpci library)</flag>
+  </use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sys-apps/hwloc/
@ 2015-02-18 20:34 Christoph Junghans
  0 siblings, 0 replies; 6+ messages in thread
From: Christoph Junghans @ 2015-02-18 20:34 UTC (permalink / raw
  To: gentoo-commits

commit:     d4d8fd1db255697bea42a2bdd4dde6ed51746006
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 18 20:34:12 2015 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Wed Feb 18 20:34:12 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=d4d8fd1d

fixed cuda build

Package-Manager: portage-2.2.14

---
 sys-apps/hwloc/ChangeLog           | 3 +++
 sys-apps/hwloc/hwloc-1.10.1.ebuild | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/sys-apps/hwloc/ChangeLog b/sys-apps/hwloc/ChangeLog
index f444a2f..517a414 100644
--- a/sys-apps/hwloc/ChangeLog
+++ b/sys-apps/hwloc/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sys-apps/hwloc/ChangeLog,v 1.49 2015/01/05 17:56:52 aballier Exp $
 
+  18 Feb 2015; Christoph Junghans <ottxor@gentoo.org> hwloc-1.10.1.ebuild:
+  fixed cuda build
+
   18 Feb 2015; Justin Lecher <jlec@gentoo.org> hwloc-1.10.1.ebuild,
   metadata.xml:
   sys-apps/hwloc: fix SLOT operators

diff --git a/sys-apps/hwloc/hwloc-1.10.1.ebuild b/sys-apps/hwloc/hwloc-1.10.1.ebuild
index 262a764..7cbc3a5 100644
--- a/sys-apps/hwloc/hwloc-1.10.1.ebuild
+++ b/sys-apps/hwloc/hwloc-1.10.1.ebuild
@@ -44,13 +44,13 @@ src_prepare() {
 	if use cuda ; then
 		append-cflags -I/opt/cuda/include
 		append-cppflags -I/opt/cuda/include
-		append-ldflags -L/opt/cuda/$(get_libdir)
 	fi
 	autotools-utils_src_prepare
 }
 
 multilib_src_configure() {
 	export HWLOC_PKG_CONFIG=$(tc-getPKG_CONFIG) #393467
+	use cuda && local LDFLAGS="${LDFLAGS} -L/opt/cuda/$(get_libdir)"
 	local myeconfargs=(
 		--disable-silent-rules
 		--docdir="${EPREFIX}"/usr/share/doc/${PF}


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sys-apps/hwloc/
@ 2015-02-19  8:04 Justin Lecher
  0 siblings, 0 replies; 6+ messages in thread
From: Justin Lecher @ 2015-02-19  8:04 UTC (permalink / raw
  To: gentoo-commits

commit:     c30aacd03ef976ed2c7a6bd765e45c632ceaedc1
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 19 08:03:40 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Feb 19 08:03:40 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=c30aacd0

sys-apps/hwloc: Set minimum support cuda toolkit version

Package-Manager: portage-2.2.17
RepoMan-Options: --force

---
 sys-apps/hwloc/ChangeLog           | 3 +++
 sys-apps/hwloc/hwloc-1.10.1.ebuild | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/sys-apps/hwloc/ChangeLog b/sys-apps/hwloc/ChangeLog
index 517a414..48256ef 100644
--- a/sys-apps/hwloc/ChangeLog
+++ b/sys-apps/hwloc/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sys-apps/hwloc/ChangeLog,v 1.49 2015/01/05 17:56:52 aballier Exp $
 
+  19 Feb 2015; Justin Lecher <jlec@gentoo.org> hwloc-1.10.1.ebuild:
+  sys-apps/hwloc: Set minimum support cuda toolkit version
+
   18 Feb 2015; Christoph Junghans <ottxor@gentoo.org> hwloc-1.10.1.ebuild:
   fixed cuda build
 

diff --git a/sys-apps/hwloc/hwloc-1.10.1.ebuild b/sys-apps/hwloc/hwloc-1.10.1.ebuild
index 7cbc3a5..e6f9c90 100644
--- a/sys-apps/hwloc/hwloc-1.10.1.ebuild
+++ b/sys-apps/hwloc/hwloc-1.10.1.ebuild
@@ -22,7 +22,7 @@ IUSE="cairo cuda debug gl +numa opencl +pci plugins svg static-libs xml X"
 
 RDEPEND=">=sys-libs/ncurses-5.9-r3[${MULTILIB_USEDEP}]
 	cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg?,${MULTILIB_USEDEP}] )
-	cuda? ( dev-util/nvidia-cuda-toolkit )
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 )
 	gl? ( media-video/nvidia-settings )
 	opencl? ( x11-drivers/ati-drivers:* )
 	pci? (


^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2015-02-19  8:04 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-02-17 15:39 [gentoo-commits] proj/sci:master commit in: sys-apps/hwloc/ Christoph Junghans
  -- strict thread matches above, loose matches on Subject: below --
2015-02-17 21:21 Christoph Junghans
2015-02-17 21:21 Christoph Junghans
2015-02-18 16:41 Justin Lecher
2015-02-18 20:34 Christoph Junghans
2015-02-19  8:04 Justin Lecher

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox