| 1 |
commit: ee5d08bf305e68c8746a778777976b83358ec47d |
| 2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Dec 5 13:32:34 2015 +0000 |
| 4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Dec 5 13:32:34 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=ee5d08bf |
| 7 |
|
| 8 |
sci-libs/atlas: Fix underlinking |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.25 |
| 11 |
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> |
| 12 |
|
| 13 |
...tlas-3.11.38.ebuild => atlas-3.11.38-r1.ebuild} | 26 +++++++++++++--------- |
| 14 |
1 file changed, 15 insertions(+), 11 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sci-libs/atlas/atlas-3.11.38.ebuild b/sci-libs/atlas/atlas-3.11.38-r1.ebuild |
| 17 |
similarity index 90% |
| 18 |
rename from sci-libs/atlas/atlas-3.11.38.ebuild |
| 19 |
rename to sci-libs/atlas/atlas-3.11.38-r1.ebuild |
| 20 |
index e0e41ec..4a7d193 100644 |
| 21 |
--- a/sci-libs/atlas/atlas-3.11.38.ebuild |
| 22 |
+++ b/sci-libs/atlas/atlas-3.11.38-r1.ebuild |
| 23 |
@@ -143,11 +143,15 @@ atlas_install_libs() { |
| 24 |
local libname=$(basename ${1%.*}) |
| 25 |
einfo "Installing ${libname}" |
| 26 |
local soname=${libname}.so.$(get_major_version) |
| 27 |
+ local _cmd |
| 28 |
shift |
| 29 |
pushd "${S}_shared"/lib > /dev/null |
| 30 |
- ${LINK:-$(tc-getCC)} ${LDFLAGS} -shared -Wl,-soname=${soname} \ |
| 31 |
- -Wl,--whole-archive ${libname}.a -Wl,--no-whole-archive \ |
| 32 |
- "$@" -o ${soname} || die "Creating ${soname} failed" |
| 33 |
+ _cmd="${LINK:-$(tc-getCC)}" |
| 34 |
+ _cmd+=" ${LDFLAGS} -shared -Wl,--no-undefined -Wl,-soname=${soname}" |
| 35 |
+ _cmd+=" -Wl,--whole-archive ${libname}.a -Wl,--no-whole-archive" |
| 36 |
+ _cmd+=" $@ -o ${soname}" |
| 37 |
+ einfo "${_cmd}" |
| 38 |
+ ${_cmd} || die "Creating ${soname} failed" |
| 39 |
dolib.so ${soname} |
| 40 |
dosym ${soname} /usr/$(get_libdir)/${soname%.*} |
| 41 |
popd > /dev/null || die |
| 42 |
@@ -190,7 +194,7 @@ src_install() { |
| 43 |
atlas_install_libs libatlas.a -lm ${PTLIBS} |
| 44 |
|
| 45 |
# cblas |
| 46 |
- atlas_install_libs libatlcblas.a -lm -L. -latlas |
| 47 |
+ atlas_install_libs libatlcblas.a -L. -latlas -lm |
| 48 |
atlas_install_pc atlcblas atlas-cblas |
| 49 |
alternatives_for cblas atlas 0 \ |
| 50 |
/usr/$(get_libdir)/pkgconfig/cblas.pc atlas-cblas.pc \ |
| 51 |
@@ -198,7 +202,7 @@ src_install() { |
| 52 |
|
| 53 |
# cblas threaded |
| 54 |
if [[ -e libptcblas.a ]]; then |
| 55 |
- atlas_install_libs libptcblas.a -lm -L. -latlas ${PTLIBS} |
| 56 |
+ atlas_install_libs libptcblas.a -L. -latlas -lm ${PTLIBS} |
| 57 |
atlas_install_pc ptcblas atlas-cblas-threads |
| 58 |
alternatives_for cblas atlas-threads 0 \ |
| 59 |
/usr/$(get_libdir)/pkgconfig/cblas.pc atlas-cblas-threads.pc \ |
| 60 |
@@ -208,12 +212,12 @@ src_install() { |
| 61 |
if use lapack; then |
| 62 |
PCREQ="cblas" |
| 63 |
# clapack |
| 64 |
- atlas_install_libs libatlclapack.a -lm -L. -latlas -latlcblas |
| 65 |
+ atlas_install_libs libatlclapack.a -L. -latlcblas -latlas -lm |
| 66 |
atlas_install_pc atlclapack atlas-clapack |
| 67 |
|
| 68 |
# clapack threaded |
| 69 |
if [[ -e libptclapack.a ]]; then |
| 70 |
- atlas_install_libs libptclapack.a -lm -L. -latlas -lptcblas ${PTLIBS} |
| 71 |
+ atlas_install_libs libptclapack.a -L. -lptcblas -latlas -lm ${PTLIBS} |
| 72 |
atlas_install_pc ptclapack atlas-clapack-threads |
| 73 |
fi |
| 74 |
fi |
| 75 |
@@ -222,14 +226,14 @@ src_install() { |
| 76 |
LINK=$(tc-getF77) PCREQ= |
| 77 |
|
| 78 |
# blas |
| 79 |
- atlas_install_libs libf77blas.a -lm -L. -latlas |
| 80 |
+ atlas_install_libs libf77blas.a -L. -latlas -lm |
| 81 |
atlas_install_pc f77blas atlas-blas |
| 82 |
alternatives_for blas atlas 0 \ |
| 83 |
/usr/$(get_libdir)/pkgconfig/blas.pc atlas-blas.pc |
| 84 |
|
| 85 |
# blas threaded |
| 86 |
if [[ -e libptf77blas.a ]]; then |
| 87 |
- atlas_install_libs libptf77blas.a -lm -L. -latlas ${PTLIBS} |
| 88 |
+ atlas_install_libs libptf77blas.a -L. -latlas -lm ${PTLIBS} |
| 89 |
atlas_install_pc ptf77blas atlas-blas-threads |
| 90 |
alternatives_for blas atlas-threads 0 \ |
| 91 |
/usr/$(get_libdir)/pkgconfig/blas.pc atlas-blas-threads.pc |
| 92 |
@@ -239,14 +243,14 @@ src_install() { |
| 93 |
PCREQ="blas cblas" |
| 94 |
# lapack |
| 95 |
atlas_install_libs libatllapack.a \ |
| 96 |
- -lm -L. -latlas -latlcblas -lf77blas |
| 97 |
+ -L. -latlcblas -lf77blas -latlas -lm |
| 98 |
atlas_install_pc atllapack atlas-lapack |
| 99 |
alternatives_for lapack atlas 0 \ |
| 100 |
/usr/$(get_libdir)/pkgconfig/lapack.pc atlas-lapack.pc |
| 101 |
# lapack threaded |
| 102 |
if [[ -e libptlapack.a ]]; then |
| 103 |
atlas_install_libs libptlapack.a \ |
| 104 |
- -lm -L. -latlas -lptcblas -lptf77blas ${PTLIBS} |
| 105 |
+ -L. -lptcblas -lptf77blas -latlas -lm ${PTLIBS} |
| 106 |
atlas_install_pc ptlapack atlas-lapack-threads |
| 107 |
alternatives_for lapack atlas-threads 0 \ |
| 108 |
/usr/$(get_libdir)/pkgconfig/lapack.pc atlas-lapack-threads.pc |
Archives