| 1 |
commit: 622c0360dd8eeddc6573ab4c3ad08eccd17dc8a1 |
| 2 |
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Dec 25 23:27:36 2020 +0000 |
| 4 |
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Dec 25 23:28:14 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=622c0360 |
| 7 |
|
| 8 |
dev-lang/julia: fix compilation |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.12, Repoman-3.0.2 |
| 11 |
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-lang/julia/julia-1.5.2-r1.ebuild | 2 +- |
| 14 |
dev-lang/julia/julia-1.5.3.ebuild | 8 ++++---- |
| 15 |
2 files changed, 5 insertions(+), 5 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-lang/julia/julia-1.5.2-r1.ebuild b/dev-lang/julia/julia-1.5.2-r1.ebuild |
| 18 |
index 5460b616b19..22f76c79cf8 100644 |
| 19 |
--- a/dev-lang/julia/julia-1.5.2-r1.ebuild |
| 20 |
+++ b/dev-lang/julia/julia-1.5.2-r1.ebuild |
| 21 |
@@ -200,7 +200,7 @@ src_install() { |
| 22 |
rmdir "${ED}"/usr/share/doc/julia || die |
| 23 |
|
| 24 |
# The appdata directory is deprecated. |
| 25 |
- mv usr/share/{appdata,metainfo}/ || die |
| 26 |
+ mv "${ED}"/usr/share/{appdata,metainfo}/ || die |
| 27 |
} |
| 28 |
|
| 29 |
pkg_postinst() { |
| 30 |
|
| 31 |
diff --git a/dev-lang/julia/julia-1.5.3.ebuild b/dev-lang/julia/julia-1.5.3.ebuild |
| 32 |
index 58e0c6d0bba..b8117838fb9 100644 |
| 33 |
--- a/dev-lang/julia/julia-1.5.3.ebuild |
| 34 |
+++ b/dev-lang/julia/julia-1.5.3.ebuild |
| 35 |
@@ -180,17 +180,17 @@ src_compile() { |
| 36 |
# Julia accesses /proc/self/mem on Linux |
| 37 |
addpredict /proc/self/mem |
| 38 |
|
| 39 |
- emake julia-release \ |
| 40 |
+ emake \ |
| 41 |
prefix="${EPREFIX}/usr" DESTDIR="${D}" \ |
| 42 |
CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" |
| 43 |
pax-mark m "$(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')" |
| 44 |
- emake |
| 45 |
} |
| 46 |
|
| 47 |
src_install() { |
| 48 |
emake install \ |
| 49 |
prefix="${EPREFIX}/usr" DESTDIR="${D}" \ |
| 50 |
- CC="$(tc-getCC)" CXX="$(tc-getCXX)" |
| 51 |
+ CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" \ |
| 52 |
+ BUNDLE_DEBUG_LIBS=0 |
| 53 |
|
| 54 |
if ! use system-llvm ; then |
| 55 |
cp "${S}/usr/lib/libLLVM"-?jl.so "${ED}/usr/$(get_libdir)/julia/" || die |
| 56 |
@@ -204,7 +204,7 @@ src_install() { |
| 57 |
rmdir "${ED}"/usr/share/doc/julia || die |
| 58 |
|
| 59 |
# The appdata directory is deprecated. |
| 60 |
- mv usr/share/{appdata,metainfo}/ || die |
| 61 |
+ mv "${ED}"/usr/share/{appdata,metainfo}/ || die |
| 62 |
} |
| 63 |
|
| 64 |
pkg_postinst() { |
Archives