diff options
author | Fabian Groffen <grobian@gentoo.org> | 2010-01-05 19:50:16 +0000 |
---|---|---|
committer | Fabian Groffen <grobian@gentoo.org> | 2010-01-05 19:50:16 +0000 |
commit | 1d029bc7993643eb1deab934ff42af8b369e1117 (patch) | |
tree | 60df2de166a17fb76088e104216636234bcc9982 /sci-libs | |
parent | ppc stable #296340 (diff) | |
download | gentoo-2-1d029bc7993643eb1deab934ff42af8b369e1117.tar.gz gentoo-2-1d029bc7993643eb1deab934ff42af8b369e1117.tar.bz2 gentoo-2-1d029bc7993643eb1deab934ff42af8b369e1117.zip |
Fix for Darwin, marked ~ppc-macos
(Portage version: 2.2.00.15171-prefix/cvs/Darwin powerpc, RepoMan options: --force)
Diffstat (limited to 'sci-libs')
-rw-r--r-- | sci-libs/scipy/ChangeLog | 5 | ||||
-rw-r--r-- | sci-libs/scipy/scipy-0.7.1.ebuild | 10 |
2 files changed, 11 insertions, 4 deletions
diff --git a/sci-libs/scipy/ChangeLog b/sci-libs/scipy/ChangeLog index 951f9e5a3492..3258b5888945 100644 --- a/sci-libs/scipy/ChangeLog +++ b/sci-libs/scipy/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sci-libs/scipy # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/ChangeLog,v 1.45 2010/01/02 18:16:49 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/ChangeLog,v 1.46 2010/01/05 19:50:16 grobian Exp $ + + 05 Jan 2010; Fabian Groffen <grobian@gentoo.org> scipy-0.7.1.ebuild: + Fix for Darwin, marked ~ppc-macos 02 Jan 2010; Christian Faulhammer <fauli@gentoo.org> scipy-0.7.1.ebuild: Transfer Prefix keywords diff --git a/sci-libs/scipy/scipy-0.7.1.ebuild b/sci-libs/scipy/scipy-0.7.1.ebuild index f800033c00b5..c1550abf52f0 100644 --- a/sci-libs/scipy/scipy-0.7.1.ebuild +++ b/sci-libs/scipy/scipy-0.7.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.7.1.ebuild,v 1.5 2010/01/02 18:16:49 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.7.1.ebuild,v 1.6 2010/01/05 19:50:16 grobian Exp $ EAPI="2" NEED_PYTHON="2.4" @@ -23,7 +23,7 @@ LICENSE="BSD" SLOT="0" IUSE="doc umfpack" #IUSE="test umfpack" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" CDEPEND=">=dev-python/numpy-1.2 virtual/cblas @@ -50,7 +50,11 @@ pkg_setup() { # scipy automatically detects libraries by default export {FFTW,FFTW3,UMFPACK}=None use umfpack && unset UMFPACK - append-ldflags -shared + # the missing symbols are in -lpythonX.Y, but since the version can + # differ, we just introduce the same scaryness as on Linux/ELF + [[ ${CHOST} == *-darwin* ]] \ + && append-ldflags -bundle "-undefined dynamic_lookup" \ + || append-ldflags -shared [[ -z ${FC} ]] && export FC=$(tc-getFC) # hack to force F77 to be FC until bug #278772 is fixed [[ -z ${F77} ]] && export F77=$(tc-getFC) |