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 AAB691382C5 for ; Thu, 8 Apr 2021 02:31:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C54DBE092C; Thu, 8 Apr 2021 02:31:23 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 B0B3BE092C for ; Thu, 8 Apr 2021 02:31:23 +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 BCF27340D3A for ; Thu, 8 Apr 2021 02:31:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A98DE64A for ; Thu, 8 Apr 2021 02:31:18 +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: <1617849032.05ecb12916b71851c74dbba2304520f8c7034189.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.3.ebuild dev-lang/julia/julia-1.6.0.ebuild X-VCS-Directories: dev-lang/julia/ X-VCS-Committer: tamiko X-VCS-Committer-Name: Matthias Maier X-VCS-Revision: 05ecb12916b71851c74dbba2304520f8c7034189 X-VCS-Branch: master Date: Thu, 8 Apr 2021 02:31:18 +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: f5abe30f-fc42-404a-8679-a390ae576c32 X-Archives-Hash: 22fb573cea5d37bfaf266677f3296467 commit: 05ecb12916b71851c74dbba2304520f8c7034189 Author: Matthias Maier gentoo org> AuthorDate: Thu Apr 8 02:30:32 2021 +0000 Commit: Matthias Maier gentoo org> CommitDate: Thu Apr 8 02:30:32 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05ecb129 dev-lang/julia: ebuild maintenance Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Matthias Maier gentoo.org> dev-lang/julia/julia-1.5.3.ebuild | 12 +++++++----- dev-lang/julia/julia-1.6.0.ebuild | 4 ++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dev-lang/julia/julia-1.5.3.ebuild b/dev-lang/julia/julia-1.5.3.ebuild index ebff8169d4a..48dc63f1925 100644 --- a/dev-lang/julia/julia-1.5.3.ebuild +++ b/dev-lang/julia/julia-1.5.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -35,9 +35,10 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="system-llvm" + # llvm:9 has been removed from the tree USE=-system-llvm force in + # profiles + #system-llvm? ( sys-devel/llvm:9=[llvm_targets_NVPTX(-)] ) RDEPEND=" - system-llvm? ( sys-devel/llvm:9=[llvm_targets_NVPTX(-)] ) - !system-llvm? ( dev-util/cmake ) " LLVM_MAX_SLOT=9 @@ -74,7 +75,8 @@ RDEPEND+=" DEPEND="${RDEPEND} dev-util/patchelf - virtual/pkgconfig" + virtual/pkgconfig + !system-llvm? ( dev-util/cmake )" PATCHES=( "${FILESDIR}"/${PN}-1.1.0-fix_build_system.patch @@ -182,7 +184,7 @@ src_compile() { addpredict /proc/self/mem emake \ - prefix="${EPREFIX}/usr" DESTDIR="${D}" \ + prefix="${EPREFIX}/usr" \ CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" pax-mark m "$(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')" } diff --git a/dev-lang/julia/julia-1.6.0.ebuild b/dev-lang/julia/julia-1.6.0.ebuild index cc14c651833..ae323aa7ab3 100644 --- a/dev-lang/julia/julia-1.6.0.ebuild +++ b/dev-lang/julia/julia-1.6.0.ebuild @@ -29,7 +29,6 @@ IUSE="+system-llvm" RDEPEND=" system-llvm? ( sys-devel/llvm:11=[llvm_targets_NVPTX(-)] ) - !system-llvm? ( dev-util/cmake ) " LLVM_MAX_SLOT=11 @@ -61,7 +60,8 @@ RDEPEND+=" DEPEND="${RDEPEND} dev-util/patchelf - virtual/pkgconfig" + virtual/pkgconfig + !system-llvm? ( dev-util/cmake )" PATCHES=( "${FILESDIR}/${PN}"-1.1.0-fix_llvm_install.patch