[gentoo-commits] repo/gentoo:master commit in: dev-lang/julia/

["Matthias Maier" <tamiko@gentoo.org>]

commit:     622c0360dd8eeddc6573ab4c3ad08eccd17dc8a1
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 25 23:27:36 2020 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Fri Dec 25 23:28:14 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=622c0360

dev-lang/julia: fix compilation

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>

 dev-lang/julia/julia-1.5.2-r1.ebuild | 2 +-
 dev-lang/julia/julia-1.5.3.ebuild    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dev-lang/julia/julia-1.5.2-r1.ebuild b/dev-lang/julia/julia-1.5.2-r1.ebuild
index 5460b616b19..22f76c79cf8 100644
--- a/dev-lang/julia/julia-1.5.2-r1.ebuild
+++ b/dev-lang/julia/julia-1.5.2-r1.ebuild
@@ -200,7 +200,7 @@ src_install() {
 	rmdir "${ED}"/usr/share/doc/julia || die
 
 	# The appdata directory is deprecated.
-	mv usr/share/{appdata,metainfo}/ || die
+	mv "${ED}"/usr/share/{appdata,metainfo}/ || die
 }
 
 pkg_postinst() {

diff --git a/dev-lang/julia/julia-1.5.3.ebuild b/dev-lang/julia/julia-1.5.3.ebuild
index 58e0c6d0bba..b8117838fb9 100644
--- a/dev-lang/julia/julia-1.5.3.ebuild
+++ b/dev-lang/julia/julia-1.5.3.ebuild
@@ -180,17 +180,17 @@ src_compile() {
 	# Julia accesses /proc/self/mem on Linux
 	addpredict /proc/self/mem
 
-	emake julia-release \
+	emake \
 		prefix="${EPREFIX}/usr" DESTDIR="${D}" \
 		CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)"
 	pax-mark m "$(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')"
-	emake
 }
 
 src_install() {
 	emake install \
 		prefix="${EPREFIX}/usr" DESTDIR="${D}" \
-		CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+		CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" \
+		BUNDLE_DEBUG_LIBS=0
 
 	if ! use system-llvm ; then
 		cp "${S}/usr/lib/libLLVM"-?jl.so "${ED}/usr/$(get_libdir)/julia/" || die
@@ -204,7 +204,7 @@ src_install() {
 	rmdir "${ED}"/usr/share/doc/julia || die
 
 	# The appdata directory is deprecated.
-	mv usr/share/{appdata,metainfo}/ || die
+	mv "${ED}"/usr/share/{appdata,metainfo}/ || die
 }
 
 pkg_postinst() {