summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2018-05-25 09:47:04 +0200
committerFabian Groffen <grobian@gentoo.org>2018-05-25 09:47:04 +0200
commit58113ca5100fe4f6c39d31c9a2c99bacc9a195b6 (patch)
tree1814da28574b487ad11f48d52b5d6914f1311d62 /dev-lang
parentsys-libs/libsepol: drop old (diff)
downloadgentoo-58113ca5100fe4f6c39d31c9a2c99bacc9a195b6.tar.gz
gentoo-58113ca5100fe4f6c39d31c9a2c99bacc9a195b6.tar.bz2
gentoo-58113ca5100fe4f6c39d31c9a2c99bacc9a195b6.zip
dev-lang/julia: fix Prefix installation, thanks Chris Rorvick, bug #651954
Closes: https://bugs.gentoo.org/651954 Package-Manager: Portage-2.3.24, Repoman-2.3.6
Diffstat (limited to 'dev-lang')
-rw-r--r--dev-lang/julia/julia-0.6.2.ebuild6
-rw-r--r--dev-lang/julia/julia-9999.ebuild8
2 files changed, 9 insertions, 5 deletions
diff --git a/dev-lang/julia/julia-0.6.2.ebuild b/dev-lang/julia/julia-0.6.2.ebuild
index 397cd144fe2d..d1600435e50c 100644
--- a/dev-lang/julia/julia-0.6.2.ebuild
+++ b/dev-lang/julia/julia-0.6.2.ebuild
@@ -153,7 +153,8 @@ src_compile() {
emake cleanall
emake VERBOSE=1 julia-release \
- prefix="/usr" DESTDIR="${D}" CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+ prefix="${EPREFIX}/usr" DESTDIR="${D}" \
+ CC="$(tc-getCC)" CXX="$(tc-getCXX)"
pax-mark m $(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')
emake
}
@@ -172,7 +173,8 @@ src_install() {
git commit -a --allow-empty -m "initial" || die "git failed"
emake install \
- prefix="/usr" DESTDIR="${D}" CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+ prefix="${EPREFIX}/usr" DESTDIR="${D}" \
+ CC="$(tc-getCC)" CXX="$(tc-getCXX)"
cat > 99julia <<-EOF
LDPATH=${EROOT%/}/usr/$(get_libdir)/julia
EOF
diff --git a/dev-lang/julia/julia-9999.ebuild b/dev-lang/julia/julia-9999.ebuild
index 86d5657b25d8..8e0c10fd4268 100644
--- a/dev-lang/julia/julia-9999.ebuild
+++ b/dev-lang/julia/julia-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -138,7 +138,8 @@ src_compile() {
emake cleanall
emake VERBOSE=1 julia-release \
- prefix="/usr" DESTDIR="${D}" CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+ prefix="${EPREFIX}/usr" DESTDIR="${D}" \
+ CC="$(tc-getCC)" CXX="$(tc-getCXX)"
pax-mark m $(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')
emake
}
@@ -149,7 +150,8 @@ src_test() {
src_install() {
emake install \
- prefix="/usr" DESTDIR="${D}" CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+ prefix="${EPREFIX}/usr" DESTDIR="${D}" \
+ CC="$(tc-getCC)" CXX="$(tc-getCXX)"
cat > 99julia <<-EOF
LDPATH=${EROOT%/}/usr/$(get_libdir)/julia
EOF