aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorS├ębastien Fabbro <bicatali@gentoo.org>2014-07-03 15:23:29 -0700
committerS├ębastien Fabbro <bicatali@gentoo.org>2014-07-03 15:23:29 -0700
commit7cb81db9514e5c8ca9b5dab85f3f39e84a6acc6d (patch)
treec365c52be8f5d3ed909425ceef8a0b4a204e9b82 /dev-lang/julia
parentMerge branch 'master' of git://git.overlays.gentoo.org/proj/sci (diff)
downloadsci-7cb81db9514e5c8ca9b5dab85f3f39e84a6acc6d.tar.gz
sci-7cb81db9514e5c8ca9b5dab85f3f39e84a6acc6d.tar.bz2
sci-7cb81db9514e5c8ca9b5dab85f3f39e84a6acc6d.zip
More prefix fixes, add missing dep
Package-Manager: portage-2.2.10.1-prefix
Diffstat (limited to 'dev-lang/julia')
-rw-r--r--dev-lang/julia/ChangeLog2
-rw-r--r--dev-lang/julia/julia-9999.ebuild18
2 files changed, 11 insertions, 9 deletions
diff --git a/dev-lang/julia/ChangeLog b/dev-lang/julia/ChangeLog
index b725a6254..3816f2c4d 100644
--- a/dev-lang/julia/ChangeLog
+++ b/dev-lang/julia/ChangeLog
@@ -21,7 +21,7 @@
14 Jul 2013; James Cloos <cloos@jhcloos.com> julia-9999.ebuild:
Julia uses submodules, so set EGIT_HAS_SUBMODULES=yes
-
+
14 Jun 2013; Justin Lecher <jlec@gentoo.org> julia-9999.ebuild, metadata.xml:
Drop KEYWORDS of live ebuilds
diff --git a/dev-lang/julia/julia-9999.ebuild b/dev-lang/julia/julia-9999.ebuild
index 32d93f37e..ae77b7076 100644
--- a/dev-lang/julia/julia-9999.ebuild
+++ b/dev-lang/julia/julia-9999.ebuild
@@ -24,13 +24,14 @@ RDEPEND="
dev-libs/mpfr:0=
dev-libs/utf8proc:0=
sci-libs/arpack:0=
+ sci-libs/camd:0=
sci-libs/cholmod:0=
sci-libs/fftw:3.0=
sci-libs/openlibm:0=
sci-libs/spqr:0=
sci-libs/umfpack:0=
sci-mathematics/glpk:0=
- >=sys-devel/llvm-3.3
+ =sys-devel/llvm-3.3*
>=sys-libs/libunwind-1.1:7=
sys-libs/readline:0=
sys-libs/zlib:0=
@@ -62,6 +63,7 @@ src_prepare() {
-e "s|/usr/include|${EPREFIX}/usr/include|" \
-e "s|\$(BUILD)/lib|\$(BUILD)/$(get_libdir)|" \
-e "s|^JULIA_COMMIT = .*|JULIA_COMMIT = v${PV}|" \
+ -e '/MARCH = /d' \
Make.inc || die
sed -i \
@@ -103,17 +105,17 @@ src_configure() {
USE_SYSTEM_ZLIB=1
VERBOSE=1
EOF
-}
-
-src_compile() {
- emake cleanall
+ emake -j1 cleanall
if [[ $(get_libdir) != lib ]]; then
mkdir -p usr/$(get_libdir) || die
ln -s $(get_libdir) usr/lib || die
fi
- emake julia-release
+}
+
+src_compile() {
+ emake -j1 julia-release
pax-mark m $(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')
- emake
+ emake -j1
use doc && emake -C doc html
use emacs && elisp-compile contrib/julia-mode.el
}
@@ -123,7 +125,7 @@ src_test() {
}
src_install() {
- emake install PREFIX="${D}/usr"
+ emake install PREFIX="${ED}/usr"
cat > 99julia <<-EOF
LDPATH=${EROOT%/}/usr/$(get_libdir)/julia
EOF