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 378401382C5 for ; Mon, 22 Jun 2020 06:53:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 66611E0855; Mon, 22 Jun 2020 06:53:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 442CEE0855 for ; Mon, 22 Jun 2020 06:53:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 AF69934EF18 for ; Mon, 22 Jun 2020 06:53:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 21EBC28E for ; Mon, 22 Jun 2020 06:53:47 +0000 (UTC) From: "Andreas K. Hüttel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas K. Hüttel" Message-ID: <1592808811.be48d7f9326cc633f5f571413194c73ae1beb1da.dilfridge@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.4.0-r2.ebuild X-VCS-Directories: dev-lang/julia/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas K. Hüttel X-VCS-Revision: be48d7f9326cc633f5f571413194c73ae1beb1da X-VCS-Branch: master Date: Mon, 22 Jun 2020 06:53:47 +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: 756e9252-741b-43df-85f3-cf50bb96d1cc X-Archives-Hash: 94a205f881cadf8a9797db18a1823e2d commit: be48d7f9326cc633f5f571413194c73ae1beb1da Author: Andreas K. Huettel gentoo org> AuthorDate: Mon Jun 22 06:53:00 2020 +0000 Commit: Andreas K. Hüttel gentoo org> CommitDate: Mon Jun 22 06:53:31 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be48d7f9 dev-lang/julia: Re-keyword 1.4.0-r2 Closes: https://bugs.gentoo.org/725862 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Andreas K. Huettel gentoo.org> dev-lang/julia/julia-1.4.0-r2.ebuild | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dev-lang/julia/julia-1.4.0-r2.ebuild b/dev-lang/julia/julia-1.4.0-r2.ebuild index 8a243c8d1f9..c55c6fab3a6 100644 --- a/dev-lang/julia/julia-1.4.0-r2.ebuild +++ b/dev-lang/julia/julia-1.4.0-r2.ebuild @@ -33,7 +33,7 @@ SRC_URI=" LICENSE="MIT" SLOT="0" -#KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~x86" IUSE="system-llvm" RDEPEND=" @@ -141,6 +141,8 @@ src_configure() { # julia does not play well with the system versions of dsfmt, libuv, # and utf8proc + use system-llvm && ewarn "You have enabled system-llvm. This is unsupported by upstream and may not work." + # USE_SYSTEM_LIBM=0 implies using external openlibm cat <<-EOF > Make.user USE_BINARYBUILDER:=0 @@ -189,7 +191,9 @@ src_install() { prefix="${EPREFIX}/usr" DESTDIR="${D}" \ CC="$(tc-getCC)" CXX="$(tc-getCXX)" - cp "${S}/usr/lib/libLLVM"-?jl.so "${ED}/usr/$(get_libdir)/julia/" || die + if ! use system-llvm ; then + cp "${S}/usr/lib/libLLVM"-?jl.so "${ED}/usr/$(get_libdir)/julia/" || die + fi dodoc README.md