| 1 |
commit: 05087873dcd1d294a3ae1c0c528b108b90eb01d5 |
| 2 |
Author: François Bissey <francois.bissey <AT> canterbury <DOT> ac <DOT> nz> |
| 3 |
AuthorDate: Sat Mar 4 21:26:52 2017 +0000 |
| 4 |
Commit: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de> |
| 5 |
CommitDate: Tue Mar 7 18:59:18 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=05087873 |
| 7 |
|
| 8 |
sci-libs/gsl: use run_in_build_dir instead of cd ${BUILDDIR}. Move 2.3-r1 to 2.3 to ease review. |
| 9 |
|
| 10 |
Package-Manager: portage-2.3.3 |
| 11 |
|
| 12 |
sci-libs/gsl/gsl-2.1.ebuild | 18 ++++------------ |
| 13 |
sci-libs/gsl/{gsl-2.3-r1.ebuild => gsl-2.3.ebuild} | 24 +++++++--------------- |
| 14 |
2 files changed, 11 insertions(+), 31 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sci-libs/gsl/gsl-2.1.ebuild b/sci-libs/gsl/gsl-2.1.ebuild |
| 17 |
index b26a45748..94c797b45 100644 |
| 18 |
--- a/sci-libs/gsl/gsl-2.1.ebuild |
| 19 |
+++ b/sci-libs/gsl/gsl-2.1.ebuild |
| 20 |
@@ -28,35 +28,25 @@ src_prepare() { |
| 21 |
|
| 22 |
src_configure() { |
| 23 |
gsl_configure() { |
| 24 |
- cd "${BUILD_DIR}" |
| 25 |
if use cblas-external; then |
| 26 |
export CBLAS_LIBS="$($(tc-getPKG_CONFIG) --libs cblas)" |
| 27 |
export CBLAS_CFLAGS="$($(tc-getPKG_CONFIG) --cflags cblas)" |
| 28 |
fi |
| 29 |
econf $(use_with cblas-external) |
| 30 |
} |
| 31 |
- multilib_foreach_abi gsl_configure |
| 32 |
+ multilib_foreach_abi run_in_build_dir gsl_configure |
| 33 |
} |
| 34 |
|
| 35 |
src_compile() { |
| 36 |
- gsl_compile() { |
| 37 |
- cd "${BUILD_DIR}" |
| 38 |
- default |
| 39 |
- } |
| 40 |
- multilib_foreach_abi gsl_compile |
| 41 |
+ multilib_foreach_abi run_in_build_dir default |
| 42 |
} |
| 43 |
|
| 44 |
src_test() { |
| 45 |
- gsl_test() { |
| 46 |
- cd "${BUILD_DIR}" |
| 47 |
- default |
| 48 |
- } |
| 49 |
- multilib_foreach_abi gsl_test |
| 50 |
+ multilib_foreach_abi run_in_build_dir default |
| 51 |
} |
| 52 |
|
| 53 |
src_install() { |
| 54 |
gsl_install() { |
| 55 |
- cd "${BUILD_DIR}" |
| 56 |
local libname=gslcblas |
| 57 |
|
| 58 |
create_pkgconfig \ |
| 59 |
@@ -73,7 +63,7 @@ src_install() { |
| 60 |
|
| 61 |
default |
| 62 |
} |
| 63 |
- multilib_foreach_abi gsl_install |
| 64 |
+ multilib_foreach_abi run_in_build_dir gsl_install |
| 65 |
|
| 66 |
# Don't add gsl as a cblas alternative if using cblas-external |
| 67 |
use cblas-external || alternatives_for cblas gsl 0 \ |
| 68 |
|
| 69 |
diff --git a/sci-libs/gsl/gsl-2.3-r1.ebuild b/sci-libs/gsl/gsl-2.3.ebuild |
| 70 |
similarity index 85% |
| 71 |
rename from sci-libs/gsl/gsl-2.3-r1.ebuild |
| 72 |
rename to sci-libs/gsl/gsl-2.3.ebuild |
| 73 |
index 95b4344be..609c0cb62 100644 |
| 74 |
--- a/sci-libs/gsl/gsl-2.3-r1.ebuild |
| 75 |
+++ b/sci-libs/gsl/gsl-2.3.ebuild |
| 76 |
@@ -30,27 +30,25 @@ src_prepare() { |
| 77 |
|
| 78 |
src_configure() { |
| 79 |
gsl_configure() { |
| 80 |
- cd "${BUILD_DIR}" |
| 81 |
if use cblas-external; then |
| 82 |
export CBLAS_LIBS="$($(tc-getPKG_CONFIG) --libs cblas)" |
| 83 |
export CBLAS_CFLAGS="$($(tc-getPKG_CONFIG) --cflags cblas)" |
| 84 |
fi |
| 85 |
econf $(use_with cblas-external) |
| 86 |
} |
| 87 |
- multilib_foreach_abi gsl_configure |
| 88 |
+ multilib_foreach_abi run_in_build_dir gsl_configure |
| 89 |
} |
| 90 |
|
| 91 |
src_compile() { |
| 92 |
- gsl_compile() { |
| 93 |
- cd "${BUILD_DIR}" |
| 94 |
- default |
| 95 |
- } |
| 96 |
- multilib_foreach_abi gsl_compile |
| 97 |
+ multilib_foreach_abi run_in_build_dir default |
| 98 |
+} |
| 99 |
+ |
| 100 |
+src_test() { |
| 101 |
+ multilib_foreach_abi run_in_build_dir default |
| 102 |
} |
| 103 |
|
| 104 |
src_install() { |
| 105 |
gsl_install() { |
| 106 |
- cd "${BUILD_DIR}" |
| 107 |
local libname=gslcblas |
| 108 |
|
| 109 |
create_pkgconfig \ |
| 110 |
@@ -67,18 +65,10 @@ src_install() { |
| 111 |
|
| 112 |
default |
| 113 |
} |
| 114 |
- multilib_foreach_abi gsl_install |
| 115 |
+ multilib_foreach_abi run_in_build_dir gsl_install |
| 116 |
|
| 117 |
# Don't add gsl as a cblas alternative if using cblas-external |
| 118 |
use cblas-external || alternatives_for cblas gsl 0 \ |
| 119 |
${GSL_ALTERNATIVES[@]} \ |
| 120 |
/usr/include/cblas.h gsl/gsl_cblas.h |
| 121 |
} |
| 122 |
- |
| 123 |
-src_test() { |
| 124 |
- gsl_test() { |
| 125 |
- cd "${BUILD_DIR}" |
| 126 |
- default |
| 127 |
- } |
| 128 |
- multilib_foreach_abi gsl_test |
| 129 |
-} |
Archives