diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2014-02-04 09:31:09 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2014-02-04 09:31:09 +0000 |
| commit | 23f6a192ba7d2ebc5b7023e50d8b25ff80ce6431 (patch) | |
| tree | 67a3cab6a940d22188be9c4e9d28c104df610157 /sci-libs | |
| parent | Fix the common coinor pkg-config installation problem (diff) | |
| download | gentoo-2-23f6a192ba7d2ebc5b7023e50d8b25ff80ce6431.tar.gz gentoo-2-23f6a192ba7d2ebc5b7023e50d8b25ff80ce6431.tar.bz2 gentoo-2-23f6a192ba7d2ebc5b7023e50d8b25ff80ce6431.zip | |
Fix underlinking and respect CC
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)
Diffstat (limited to 'sci-libs')
| -rw-r--r-- | sci-libs/coinor-csdp/ChangeLog | 8 | ||||
| -rw-r--r-- | sci-libs/coinor-csdp/coinor-csdp-6.1.1-r1.ebuild (renamed from sci-libs/coinor-csdp/coinor-csdp-6.1.1.ebuild) | 12 |
2 files changed, 14 insertions, 6 deletions
diff --git a/sci-libs/coinor-csdp/ChangeLog b/sci-libs/coinor-csdp/ChangeLog index 1850107c882d..3ce8f4ea6db2 100644 --- a/sci-libs/coinor-csdp/ChangeLog +++ b/sci-libs/coinor-csdp/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sci-libs/coinor-csdp # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/coinor-csdp/ChangeLog,v 1.2 2014/01/15 19:51:27 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/coinor-csdp/ChangeLog,v 1.3 2014/02/04 09:31:09 jlec Exp $ + +*coinor-csdp-6.1.1-r1 (04 Feb 2014) + + 04 Feb 2014; Justin Lecher <jlec@gentoo.org> +coinor-csdp-6.1.1-r1.ebuild, + -coinor-csdp-6.1.1.ebuild: + Fix underlinking and respect CC 15 Jan 2014; Sébastien Fabbro <bicatali@gentoo.org> coinor-csdp-6.1.1.ebuild: diff --git a/sci-libs/coinor-csdp/coinor-csdp-6.1.1.ebuild b/sci-libs/coinor-csdp/coinor-csdp-6.1.1-r1.ebuild index c175506f8a6c..e7fbc893d6fb 100644 --- a/sci-libs/coinor-csdp/coinor-csdp-6.1.1.ebuild +++ b/sci-libs/coinor-csdp/coinor-csdp-6.1.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/coinor-csdp/coinor-csdp-6.1.1.ebuild,v 1.2 2014/01/15 19:51:27 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/coinor-csdp/coinor-csdp-6.1.1-r1.ebuild,v 1.1 2014/02/04 09:31:09 jlec Exp $ EAPI=5 @@ -56,13 +56,13 @@ pkg_setup() { } src_prepare() { - find . -name Makefile -exec sed -i -e 's:make:$(MAKE):g' '{}' \; + find . -name Makefile -exec sed -i -e 's:make:$(MAKE):g' '{}' + || die append-cflags -DNOSHORTS -DUSEGETTIME -I../include if use openmp; then [[ $(tc-getCC) == *gcc* ]] && append-cflags -fopenmp \ && append-ldflags -fopenmp [[ $(tc-getCC) == *icc* ]] && append-cflags -openmp - append-cflags -DUSEOPENMP + append-cflags -DUSEOPENMP fi use amd64 && append-cflags -DBIT64 [[ $($(tc-getPKG_CONFIG) --libs blas) =~ atlas ]] && append-cflags -DUSEATLAS @@ -70,6 +70,8 @@ src_prepare() { -e "s:-O3:${CFLAGS} ${LDFLAGS}:" \ -e "s:ar :$(tc-getAR) :" \ */Makefile || die + + tc-export CC } src_compile() { @@ -77,8 +79,8 @@ src_compile() { local libs="$($(tc-getPKG_CONFIG) --libs blas lapack)" static_to_shared lib/libsdp.a ${libs} use static-libs && emake -C lib clean && emake -C lib - emake -C solver LIBS="${libs} -L../lib -lsdp" - emake -C theta LIBS="${libs} -L../lib -lsdp" + emake -C solver LIBS="${libs} -L../lib -lsdp -lm" + emake -C theta LIBS="${libs} -L../lib -lsdp -lm" } src_test() { |