| 1 |
commit: 05ecb12916b71851c74dbba2304520f8c7034189 |
| 2 |
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Apr 8 02:30:32 2021 +0000 |
| 4 |
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Apr 8 02:30:32 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05ecb129 |
| 7 |
|
| 8 |
dev-lang/julia: ebuild maintenance |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.18, Repoman-3.0.3 |
| 11 |
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-lang/julia/julia-1.5.3.ebuild | 12 +++++++----- |
| 14 |
dev-lang/julia/julia-1.6.0.ebuild | 4 ++-- |
| 15 |
2 files changed, 9 insertions(+), 7 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-lang/julia/julia-1.5.3.ebuild b/dev-lang/julia/julia-1.5.3.ebuild |
| 18 |
index ebff8169d4a..48dc63f1925 100644 |
| 19 |
--- a/dev-lang/julia/julia-1.5.3.ebuild |
| 20 |
+++ b/dev-lang/julia/julia-1.5.3.ebuild |
| 21 |
@@ -1,4 +1,4 @@ |
| 22 |
-# Copyright 1999-2020 Gentoo Authors |
| 23 |
+# Copyright 1999-2021 Gentoo Authors |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
|
| 26 |
EAPI=7 |
| 27 |
@@ -35,9 +35,10 @@ SLOT="0" |
| 28 |
KEYWORDS="~amd64 ~x86" |
| 29 |
IUSE="system-llvm" |
| 30 |
|
| 31 |
+ # llvm:9 has been removed from the tree USE=-system-llvm force in |
| 32 |
+ # profiles |
| 33 |
+ #system-llvm? ( sys-devel/llvm:9=[llvm_targets_NVPTX(-)] ) |
| 34 |
RDEPEND=" |
| 35 |
- system-llvm? ( sys-devel/llvm:9=[llvm_targets_NVPTX(-)] ) |
| 36 |
- !system-llvm? ( dev-util/cmake ) |
| 37 |
" |
| 38 |
LLVM_MAX_SLOT=9 |
| 39 |
|
| 40 |
@@ -74,7 +75,8 @@ RDEPEND+=" |
| 41 |
|
| 42 |
DEPEND="${RDEPEND} |
| 43 |
dev-util/patchelf |
| 44 |
- virtual/pkgconfig" |
| 45 |
+ virtual/pkgconfig |
| 46 |
+ !system-llvm? ( dev-util/cmake )" |
| 47 |
|
| 48 |
PATCHES=( |
| 49 |
"${FILESDIR}"/${PN}-1.1.0-fix_build_system.patch |
| 50 |
@@ -182,7 +184,7 @@ src_compile() { |
| 51 |
addpredict /proc/self/mem |
| 52 |
|
| 53 |
emake \ |
| 54 |
- prefix="${EPREFIX}/usr" DESTDIR="${D}" \ |
| 55 |
+ prefix="${EPREFIX}/usr" \ |
| 56 |
CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" |
| 57 |
pax-mark m "$(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')" |
| 58 |
} |
| 59 |
|
| 60 |
diff --git a/dev-lang/julia/julia-1.6.0.ebuild b/dev-lang/julia/julia-1.6.0.ebuild |
| 61 |
index cc14c651833..ae323aa7ab3 100644 |
| 62 |
--- a/dev-lang/julia/julia-1.6.0.ebuild |
| 63 |
+++ b/dev-lang/julia/julia-1.6.0.ebuild |
| 64 |
@@ -29,7 +29,6 @@ IUSE="+system-llvm" |
| 65 |
|
| 66 |
RDEPEND=" |
| 67 |
system-llvm? ( sys-devel/llvm:11=[llvm_targets_NVPTX(-)] ) |
| 68 |
- !system-llvm? ( dev-util/cmake ) |
| 69 |
" |
| 70 |
LLVM_MAX_SLOT=11 |
| 71 |
|
| 72 |
@@ -61,7 +60,8 @@ RDEPEND+=" |
| 73 |
|
| 74 |
DEPEND="${RDEPEND} |
| 75 |
dev-util/patchelf |
| 76 |
- virtual/pkgconfig" |
| 77 |
+ virtual/pkgconfig |
| 78 |
+ !system-llvm? ( dev-util/cmake )" |
| 79 |
|
| 80 |
PATCHES=( |
| 81 |
"${FILESDIR}/${PN}"-1.1.0-fix_llvm_install.patch |
Archives