| 1 |
commit: 7cb81db9514e5c8ca9b5dab85f3f39e84a6acc6d |
| 2 |
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jul 3 22:23:29 2014 +0000 |
| 4 |
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jul 3 22:23:29 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=7cb81db9 |
| 7 |
|
| 8 |
More prefix fixes, add missing dep |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.10.1-prefix |
| 11 |
|
| 12 |
--- |
| 13 |
dev-lang/julia/ChangeLog | 2 +- |
| 14 |
dev-lang/julia/julia-9999.ebuild | 18 ++++++++++-------- |
| 15 |
2 files changed, 11 insertions(+), 9 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-lang/julia/ChangeLog b/dev-lang/julia/ChangeLog |
| 18 |
index b725a62..3816f2c 100644 |
| 19 |
--- a/dev-lang/julia/ChangeLog |
| 20 |
+++ b/dev-lang/julia/ChangeLog |
| 21 |
@@ -21,7 +21,7 @@ |
| 22 |
|
| 23 |
14 Jul 2013; James Cloos <cloos@×××××××.com> julia-9999.ebuild: |
| 24 |
Julia uses submodules, so set EGIT_HAS_SUBMODULES=yes |
| 25 |
- |
| 26 |
+ |
| 27 |
14 Jun 2013; Justin Lecher <jlec@g.o> julia-9999.ebuild, metadata.xml: |
| 28 |
Drop KEYWORDS of live ebuilds |
| 29 |
|
| 30 |
|
| 31 |
diff --git a/dev-lang/julia/julia-9999.ebuild b/dev-lang/julia/julia-9999.ebuild |
| 32 |
index 32d93f3..ae77b70 100644 |
| 33 |
--- a/dev-lang/julia/julia-9999.ebuild |
| 34 |
+++ b/dev-lang/julia/julia-9999.ebuild |
| 35 |
@@ -24,13 +24,14 @@ RDEPEND=" |
| 36 |
dev-libs/mpfr:0= |
| 37 |
dev-libs/utf8proc:0= |
| 38 |
sci-libs/arpack:0= |
| 39 |
+ sci-libs/camd:0= |
| 40 |
sci-libs/cholmod:0= |
| 41 |
sci-libs/fftw:3.0= |
| 42 |
sci-libs/openlibm:0= |
| 43 |
sci-libs/spqr:0= |
| 44 |
sci-libs/umfpack:0= |
| 45 |
sci-mathematics/glpk:0= |
| 46 |
- >=sys-devel/llvm-3.3 |
| 47 |
+ =sys-devel/llvm-3.3* |
| 48 |
>=sys-libs/libunwind-1.1:7= |
| 49 |
sys-libs/readline:0= |
| 50 |
sys-libs/zlib:0= |
| 51 |
@@ -62,6 +63,7 @@ src_prepare() { |
| 52 |
-e "s|/usr/include|${EPREFIX}/usr/include|" \ |
| 53 |
-e "s|\$(BUILD)/lib|\$(BUILD)/$(get_libdir)|" \ |
| 54 |
-e "s|^JULIA_COMMIT = .*|JULIA_COMMIT = v${PV}|" \ |
| 55 |
+ -e '/MARCH = /d' \ |
| 56 |
Make.inc || die |
| 57 |
|
| 58 |
sed -i \ |
| 59 |
@@ -103,17 +105,17 @@ src_configure() { |
| 60 |
USE_SYSTEM_ZLIB=1 |
| 61 |
VERBOSE=1 |
| 62 |
EOF |
| 63 |
-} |
| 64 |
- |
| 65 |
-src_compile() { |
| 66 |
- emake cleanall |
| 67 |
+ emake -j1 cleanall |
| 68 |
if [[ $(get_libdir) != lib ]]; then |
| 69 |
mkdir -p usr/$(get_libdir) || die |
| 70 |
ln -s $(get_libdir) usr/lib || die |
| 71 |
fi |
| 72 |
- emake julia-release |
| 73 |
+} |
| 74 |
+ |
| 75 |
+src_compile() { |
| 76 |
+ emake -j1 julia-release |
| 77 |
pax-mark m $(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}') |
| 78 |
- emake |
| 79 |
+ emake -j1 |
| 80 |
use doc && emake -C doc html |
| 81 |
use emacs && elisp-compile contrib/julia-mode.el |
| 82 |
} |
| 83 |
@@ -123,7 +125,7 @@ src_test() { |
| 84 |
} |
| 85 |
|
| 86 |
src_install() { |
| 87 |
- emake install PREFIX="${D}/usr" |
| 88 |
+ emake install PREFIX="${ED}/usr" |
| 89 |
cat > 99julia <<-EOF |
| 90 |
LDPATH=${EROOT%/}/usr/$(get_libdir)/julia |
| 91 |
EOF |
Archives