commit: 05087873dcd1d294a3ae1c0c528b108b90eb01d5
Author: François Bissey <francois.bissey <AT> canterbury <DOT> ac <DOT> nz>
AuthorDate: Sat Mar 4 21:26:52 2017 +0000
Commit: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
CommitDate: Tue Mar 7 18:59:18 2017 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=05087873
sci-libs/gsl: use run_in_build_dir instead of cd ${BUILDDIR}. Move 2.3-r1 to
2.3 to ease review.
Package-Manager: portage-2.3.3
sci-libs/gsl/gsl-2.1.ebuild | 18 ++++------------
sci-libs/gsl/{gsl-2.3-r1.ebuild => gsl-2.3.ebuild} | 24 +++++++---------------
2 files changed, 11 insertions(+), 31 deletions(-)
diff --git a/sci-libs/gsl/gsl-2.1.ebuild b/sci-libs/gsl/gsl-2.1.ebuild
index b26a45748..94c797b45 100644
--- a/sci-libs/gsl/gsl-2.1.ebuild
+++ b/sci-libs/gsl/gsl-2.1.ebuild
@@ -28,35 +28,25 @@ src_prepare() {
src_configure() {
gsl_configure() {
- cd "${BUILD_DIR}"
if use cblas-external; then
export CBLAS_LIBS="$($(tc-getPKG_CONFIG) --libs cblas)"
export CBLAS_CFLAGS="$($(tc-getPKG_CONFIG) --cflags
cblas)"
fi
econf $(use_with cblas-external)
}
- multilib_foreach_abi gsl_configure
+ multilib_foreach_abi run_in_build_dir gsl_configure
}
src_compile() {
- gsl_compile() {
- cd "${BUILD_DIR}"
- default
- }
- multilib_foreach_abi gsl_compile
+ multilib_foreach_abi run_in_build_dir default
}
src_test() {
- gsl_test() {
- cd "${BUILD_DIR}"
- default
- }
- multilib_foreach_abi gsl_test
+ multilib_foreach_abi run_in_build_dir default
}
src_install() {
gsl_install() {
- cd "${BUILD_DIR}"
local libname=gslcblas
create_pkgconfig \
@@ -73,7 +63,7 @@ src_install() {
default
}
- multilib_foreach_abi gsl_install
+ multilib_foreach_abi run_in_build_dir gsl_install
# Don't add gsl as a cblas alternative if using cblas-external
use cblas-external || alternatives_for cblas gsl 0 \
diff --git a/sci-libs/gsl/gsl-2.3-r1.ebuild b/sci-libs/gsl/gsl-2.3.ebuild
similarity index 85%
rename from sci-libs/gsl/gsl-2.3-r1.ebuild
rename to sci-libs/gsl/gsl-2.3.ebuild
index 95b4344be..609c0cb62 100644
--- a/sci-libs/gsl/gsl-2.3-r1.ebuild
+++ b/sci-libs/gsl/gsl-2.3.ebuild
@@ -30,27 +30,25 @@ src_prepare() {
src_configure() {
gsl_configure() {
- cd "${BUILD_DIR}"
if use cblas-external; then
export CBLAS_LIBS="$($(tc-getPKG_CONFIG) --libs cblas)"
export CBLAS_CFLAGS="$($(tc-getPKG_CONFIG) --cflags
cblas)"
fi
econf $(use_with cblas-external)
}
- multilib_foreach_abi gsl_configure
+ multilib_foreach_abi run_in_build_dir gsl_configure
}
src_compile() {
- gsl_compile() {
- cd "${BUILD_DIR}"
- default
- }
- multilib_foreach_abi gsl_compile
+ multilib_foreach_abi run_in_build_dir default
+}
+
+src_test() {
+ multilib_foreach_abi run_in_build_dir default
}
src_install() {
gsl_install() {
- cd "${BUILD_DIR}"
local libname=gslcblas
create_pkgconfig \
@@ -67,18 +65,10 @@ src_install() {
default
}
- multilib_foreach_abi gsl_install
+ multilib_foreach_abi run_in_build_dir gsl_install
# Don't add gsl as a cblas alternative if using cblas-external
use cblas-external || alternatives_for cblas gsl 0 \
${GSL_ALTERNATIVES[@]} \
/usr/include/cblas.h gsl/gsl_cblas.h
}
-
-src_test() {
- gsl_test() {
- cd "${BUILD_DIR}"
- default
- }
- multilib_foreach_abi gsl_test
-}
