[gentoo-commits] proj/sci:master commit in: sys-apps/hwloc/

[Christoph Junghans]

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 <ott...@gentoo.org> hwloc-1.10.1.ebuild:
+  fixed cuda build
+
   18 Feb 2015; Justin Lecher <j...@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}