summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Fabbro <bicatali@gentoo.org>2013-03-04 19:08:43 +0000
committerSebastien Fabbro <bicatali@gentoo.org>2013-03-04 19:08:43 +0000
commit4387ce9ce7938378e2a4f4d68772bb12b774f8c8 (patch)
tree91834385ace95e37c25a4079607e5b1857b211a5 /sci-libs/shogun
parentfixed build with boost-1.52 (bug #460238), also broken intermediate version (diff)
downloadgentoo-2-4387ce9ce7938378e2a4f4d68772bb12b774f8c8.tar.gz
gentoo-2-4387ce9ce7938378e2a4f4d68772bb12b774f8c8.tar.bz2
gentoo-2-4387ce9ce7938378e2a4f4d68772bb12b774f8c8.zip
Force linking with threads in every case
(Portage version: 2.2.01.21688-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360)
Diffstat (limited to 'sci-libs/shogun')
-rw-r--r--sci-libs/shogun/ChangeLog6
-rw-r--r--sci-libs/shogun/files/shogun-1.1.0-respect-ldflags.patch2
-rw-r--r--sci-libs/shogun/shogun-2.0.0.ebuild5
3 files changed, 8 insertions, 5 deletions
diff --git a/sci-libs/shogun/ChangeLog b/sci-libs/shogun/ChangeLog
index f2f081c901f1..430f9e007d99 100644
--- a/sci-libs/shogun/ChangeLog
+++ b/sci-libs/shogun/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sci-libs/shogun
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/shogun/ChangeLog,v 1.6 2013/03/03 07:14:13 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/shogun/ChangeLog,v 1.7 2013/03/04 19:08:43 bicatali Exp $
+
+ 04 Mar 2013; Sébastien Fabbro <bicatali@gentoo.org>
+ files/shogun-1.1.0-respect-ldflags.patch, shogun-2.0.0.ebuild:
+ Force linking with threads in every case
*shogun-2.0.0 (03 Mar 2013)
diff --git a/sci-libs/shogun/files/shogun-1.1.0-respect-ldflags.patch b/sci-libs/shogun/files/shogun-1.1.0-respect-ldflags.patch
index 0e4a331d354c..60753606cdb8 100644
--- a/sci-libs/shogun/files/shogun-1.1.0-respect-ldflags.patch
+++ b/sci-libs/shogun/files/shogun-1.1.0-respect-ldflags.patch
@@ -6,7 +6,7 @@ diff -Nur src.orig/configure src/configure
DEFINES_SWIG=
PRELINKFLAGS=
-LINKFLAGS=
-+LINKFLAGS="$LDFLAGS"
++LINKFLAGS="$LDFLAGS -lpthread"
POSTLINKFLAGS=
INCLUDES_STATIC_INTERFACES=
diff --git a/sci-libs/shogun/shogun-2.0.0.ebuild b/sci-libs/shogun/shogun-2.0.0.ebuild
index 390797c5afb2..1ae807461653 100644
--- a/sci-libs/shogun/shogun-2.0.0.ebuild
+++ b/sci-libs/shogun/shogun-2.0.0.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/shogun/shogun-2.0.0.ebuild,v 1.1 2013/03/03 07:14:13 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/shogun/shogun-2.0.0.ebuild,v 1.2 2013/03/04 19:08:43 bicatali Exp $
EAPI=5
-inherit eutils multilib versionator toolchain-funcs java-pkg-opt-2 flag-o-matic
+inherit eutils multilib versionator toolchain-funcs java-pkg-opt-2
MYPV=$(get_version_component_range 1-2)
MYPD=${PN}-data-0.4
@@ -101,7 +101,6 @@ src_configure() {
# gentoo bug #302621
use hdf5 && has_version sci-libs/hdf5[mpi] && export CXX=mpicxx CC=mpicc
- use smp && append-ldflags -pthread
./configure \
--disable-cpudetection \
--destdir="${D}" \