| 1 |
commit: d166beaefa32ee96bba9d3e4c3fca9c3e680d7ab |
| 2 |
Author: François Bissey <francois.bissey <AT> canterbury <DOT> ac <DOT> nz> |
| 3 |
AuthorDate: Wed Aug 27 03:52:41 2014 +0000 |
| 4 |
Commit: Francois Bissey <f.r.bissey <AT> massey <DOT> ac <DOT> nz> |
| 5 |
CommitDate: Wed Aug 27 03:52:41 2014 +0000 |
| 6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=d166beae |
| 7 |
|
| 8 |
Few fixes: julia wants threaded fftw; multilib-strict install; Added USE_BLAS64=0 to Make.user, some proprietary blas/lapack may be |
| 9 |
suitable for the other setting but we cannot count on julia to recognize support just based on name. |
| 10 |
|
| 11 |
Package-Manager: portage-2.2.10 |
| 12 |
|
| 13 |
--- |
| 14 |
dev-lang/julia/ChangeLog | 7 +++++++ |
| 15 |
dev-lang/julia/julia-9999.ebuild | 7 ++++--- |
| 16 |
2 files changed, 11 insertions(+), 3 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-lang/julia/ChangeLog b/dev-lang/julia/ChangeLog |
| 19 |
index 3816f2c..9a0ecfe 100644 |
| 20 |
--- a/dev-lang/julia/ChangeLog |
| 21 |
+++ b/dev-lang/julia/ChangeLog |
| 22 |
@@ -2,6 +2,13 @@ |
| 23 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 24 |
# $Header: $ |
| 25 |
|
| 26 |
+ 27 Aug 2014; François Bissey <francois.bissey@×××××××××××××.nz> |
| 27 |
+ julia-9999.ebuild: |
| 28 |
+ Few fixes: julia wants threaded fftw; multilib-strict install; Added |
| 29 |
+ USE_BLAS64=0 to Make.user, some proprietary blas/lapack may be suitable for |
| 30 |
+ the other setting but we cannot count on julia to recognize support just based |
| 31 |
+ on name. |
| 32 |
+ |
| 33 |
02 Apr 2014; Sebastien Fabbro <fabbros@g.o> julia-9999.ebuild, |
| 34 |
metadata.xml: |
| 35 |
various consistent fixes for main tree |
| 36 |
|
| 37 |
diff --git a/dev-lang/julia/julia-9999.ebuild b/dev-lang/julia/julia-9999.ebuild |
| 38 |
index ae77b70..bac01db 100644 |
| 39 |
--- a/dev-lang/julia/julia-9999.ebuild |
| 40 |
+++ b/dev-lang/julia/julia-9999.ebuild |
| 41 |
@@ -26,7 +26,7 @@ RDEPEND=" |
| 42 |
sci-libs/arpack:0= |
| 43 |
sci-libs/camd:0= |
| 44 |
sci-libs/cholmod:0= |
| 45 |
- sci-libs/fftw:3.0= |
| 46 |
+ sci-libs/fftw:3.0=[threads] |
| 47 |
sci-libs/openlibm:0= |
| 48 |
sci-libs/spqr:0= |
| 49 |
sci-libs/umfpack:0= |
| 50 |
@@ -58,7 +58,7 @@ src_prepare() { |
| 51 |
sed -i \ |
| 52 |
-e "s|\(JULIA_EXECUTABLE = \)\(\$(JULIAHOME)/julia\)|\1 LD_LIBRARY_PATH=\$(BUILD)/$(get_libdir) \2|" \ |
| 53 |
-e "s|-O3|${CFLAGS}|g" \ |
| 54 |
- -e "s|LIBDIR = lib|LIBDIR = $(get_libdir)|" \ |
| 55 |
+ -e "s|libdir = \$(prefix)/lib|libdir = \$(prefix)/$(get_libdir)|" \ |
| 56 |
-e "s|/usr/lib|${EPREFIX}/usr/$(get_libdir)|" \ |
| 57 |
-e "s|/usr/include|${EPREFIX}/usr/include|" \ |
| 58 |
-e "s|\$(BUILD)/lib|\$(BUILD)/$(get_libdir)|" \ |
| 59 |
@@ -83,6 +83,7 @@ src_configure() { |
| 60 |
LIBBLASNAME=$($(tc-getPKG_CONFIG) --libs blas | sed -e "s/-l\([a-z0-9]*\).*/lib\1/") |
| 61 |
LIBLAPACK=$($(tc-getPKG_CONFIG) --libs lapack) |
| 62 |
LIBLAPACKNAME=$($(tc-getPKG_CONFIG) --libs lapack | sed -e "s/-l\([a-z0-9]*\).*/lib\1/") |
| 63 |
+ USE_BLAS64=0 |
| 64 |
USE_LLVM_SHLIB=1 |
| 65 |
USE_SYSTEM_ARPACK=1 |
| 66 |
USE_SYSTEM_BLAS=1 |
| 67 |
@@ -125,7 +126,7 @@ src_test() { |
| 68 |
} |
| 69 |
|
| 70 |
src_install() { |
| 71 |
- emake install PREFIX="${ED}/usr" |
| 72 |
+ emake install prefix="${ED}/usr" |
| 73 |
cat > 99julia <<-EOF |
| 74 |
LDPATH=${EROOT%/}/usr/$(get_libdir)/julia |
| 75 |
EOF |
Archives