diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2013-03-29 12:17:43 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2013-03-29 12:17:43 +0000 |
| commit | 4bad94bde2555df2dd862a64e0f4524184f9750c (patch) | |
| tree | 0eaa8192b0a9d41a6698030f8e7aab32d3049ff9 /sci-libs | |
| parent | Version bump for Gnome 3.8 (diff) | |
| download | gentoo-2-4bad94bde2555df2dd862a64e0f4524184f9750c.tar.gz gentoo-2-4bad94bde2555df2dd862a64e0f4524184f9750c.tar.bz2 gentoo-2-4bad94bde2555df2dd862a64e0f4524184f9750c.zip | |
sci-libs/gsl: Move compiler specific checks into src_prepare to macke the package binary friendly, #463724
(Portage version: 2.2.0_alpha170/cvs/Linux x86_64, signed Manifest commit with key 8009D6F070EB7916)
Diffstat (limited to 'sci-libs')
| -rw-r--r-- | sci-libs/gsl/ChangeLog | 7 | ||||
| -rw-r--r-- | sci-libs/gsl/gsl-1.14-r1.ebuild | 6 | ||||
| -rw-r--r-- | sci-libs/gsl/gsl-1.15.ebuild | 6 |
3 files changed, 11 insertions, 8 deletions
diff --git a/sci-libs/gsl/ChangeLog b/sci-libs/gsl/ChangeLog index 2dacb6a7b51c..ec1cec542e00 100644 --- a/sci-libs/gsl/ChangeLog +++ b/sci-libs/gsl/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sci-libs/gsl # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/ChangeLog,v 1.84 2013/02/21 21:36:16 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/ChangeLog,v 1.85 2013/03/29 12:17:43 jlec Exp $ + + 29 Mar 2013; Justin Lecher <jlec@gentoo.org> gsl-1.14-r1.ebuild, + gsl-1.15.ebuild: + Move compiler specific checks into src_prepare to macke the package binary + friendly, #463724 21 Feb 2013; Justin Lecher <jlec@gentoo.org> -gsl-1.13-r1.ebuild, -gsl-1.13-r2.ebuild, gsl-1.14.ebuild, gsl-1.14-r1.ebuild, gsl-1.15.ebuild, diff --git a/sci-libs/gsl/gsl-1.14-r1.ebuild b/sci-libs/gsl/gsl-1.14-r1.ebuild index 8cd784d678e8..752c76cf7760 100644 --- a/sci-libs/gsl/gsl-1.14-r1.ebuild +++ b/sci-libs/gsl/gsl-1.14-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/gsl-1.14-r1.ebuild,v 1.7 2013/02/21 21:36:16 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/gsl-1.14-r1.ebuild,v 1.8 2013/03/29 12:17:43 jlec Exp $ EAPI="3" @@ -30,16 +30,16 @@ pkg_setup() { ewarn "Please install and/or eselect another cblas" die "Circular gsl dependency" fi +} +src_prepare() { # bug 349005 [[ $(tc-getCC)$ == *gcc* ]] && \ [[ $(tc-getCC)$ != *apple* ]] && \ [[ $(gcc-major-version)$(gcc-minor-version) -eq 44 ]] \ && filter-mfpmath sse filter-flags -ffast-math -} -src_prepare() { epatch "${FILESDIR}"/${P}-cblas.patch eautoreconf diff --git a/sci-libs/gsl/gsl-1.15.ebuild b/sci-libs/gsl/gsl-1.15.ebuild index 00265481fc63..c4e7f3a56f7c 100644 --- a/sci-libs/gsl/gsl-1.15.ebuild +++ b/sci-libs/gsl/gsl-1.15.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/gsl-1.15.ebuild,v 1.5 2013/02/21 21:36:16 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/gsl-1.15.ebuild,v 1.6 2013/03/29 12:17:43 jlec Exp $ EAPI=4 @@ -36,7 +36,7 @@ pkg_pretend() { fi } -pkg_setup() { +src_prepare() { ESELECT_PROF="gsl" # bug 349005 @@ -45,9 +45,7 @@ pkg_setup() { [[ $(gcc-major-version)$(gcc-minor-version) -eq 44 ]] \ && filter-mfpmath sse filter-flags -ffast-math -} -src_prepare() { epatch "${FILESDIR}"/${P}-cblas.patch eautoreconf |