From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 497781382C5 for ; Fri, 25 Dec 2020 23:28:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6F382E0BEB; Fri, 25 Dec 2020 23:28:38 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 54630E0BEB for ; Fri, 25 Dec 2020 23:28:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 198B03419E0 for ; Fri, 25 Dec 2020 23:28:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7F81C50 for ; Fri, 25 Dec 2020 23:28:35 +0000 (UTC) From: "Matthias Maier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matthias Maier" Message-ID: <1608938894.622c0360dd8eeddc6573ab4c3ad08eccd17dc8a1.tamiko@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/julia/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/julia/julia-1.5.2-r1.ebuild dev-lang/julia/julia-1.5.3.ebuild X-VCS-Directories: dev-lang/julia/ X-VCS-Committer: tamiko X-VCS-Committer-Name: Matthias Maier X-VCS-Revision: 622c0360dd8eeddc6573ab4c3ad08eccd17dc8a1 X-VCS-Branch: master Date: Fri, 25 Dec 2020 23:28:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7843fba9-e53e-4d23-8afc-114ded7c7ba1 X-Archives-Hash: e1b6cfa21793c68489c6c4ba04fb290e commit: 622c0360dd8eeddc6573ab4c3ad08eccd17dc8a1 Author: Matthias Maier gentoo org> AuthorDate: Fri Dec 25 23:27:36 2020 +0000 Commit: Matthias Maier gentoo 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 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() {