| 1 |
commit: 03d57bfb0511e2f8529984c35e10b61126696763 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Feb 1 05:14:08 2023 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Feb 1 05:14:08 2023 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03d57bfb |
| 7 |
|
| 8 |
llvm.org.eclass: Remove LLVM < 14 support |
| 9 |
|
| 10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 11 |
|
| 12 |
eclass/llvm.org.eclass | 65 ++++++++++++++++---------------------------------- |
| 13 |
1 file changed, 20 insertions(+), 45 deletions(-) |
| 14 |
|
| 15 |
diff --git a/eclass/llvm.org.eclass b/eclass/llvm.org.eclass |
| 16 |
index da243ac01b35..636ccea076f8 100644 |
| 17 |
--- a/eclass/llvm.org.eclass |
| 18 |
+++ b/eclass/llvm.org.eclass |
| 19 |
@@ -106,7 +106,7 @@ fi |
| 20 |
|
| 21 |
inherit multiprocessing |
| 22 |
|
| 23 |
-if [[ ${_LLVM_SOURCE_TYPE} == tar ]] && ver_test -ge 14.0.5; then |
| 24 |
+if [[ ${_LLVM_SOURCE_TYPE} == tar ]]; then |
| 25 |
inherit verify-sig |
| 26 |
fi |
| 27 |
|
| 28 |
@@ -177,16 +177,6 @@ fi |
| 29 |
# version. The value depends on ${PV}. |
| 30 |
|
| 31 |
case ${LLVM_MAJOR} in |
| 32 |
- 10|11|12) |
| 33 |
- # this API is not present for old LLVM versions |
| 34 |
- ;; |
| 35 |
- 13) |
| 36 |
- ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY M68k VE ) |
| 37 |
- ALL_LLVM_PRODUCTION_TARGETS=( |
| 38 |
- AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430 NVPTX |
| 39 |
- PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore |
| 40 |
- ) |
| 41 |
- ;; |
| 42 |
14) |
| 43 |
ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY M68k ) |
| 44 |
ALL_LLVM_PRODUCTION_TARGETS=( |
| 45 |
@@ -253,24 +243,18 @@ llvm.org_set_globals() { |
| 46 |
EGIT_BRANCH="release/${LLVM_MAJOR}.x" |
| 47 |
;; |
| 48 |
tar) |
| 49 |
- if ver_test -ge 14.0.5; then |
| 50 |
- SRC_URI+=" |
| 51 |
- https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV/_/-}/llvm-project-${PV/_/}.src.tar.xz |
| 52 |
- verify-sig? ( |
| 53 |
- https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV/_/-}/llvm-project-${PV/_/}.src.tar.xz.sig |
| 54 |
- ) |
| 55 |
- " |
| 56 |
- BDEPEND+=" |
| 57 |
- verify-sig? ( |
| 58 |
- >=sec-keys/openpgp-keys-llvm-15 |
| 59 |
- ) |
| 60 |
- " |
| 61 |
- VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/llvm.asc |
| 62 |
- else |
| 63 |
- SRC_URI+=" |
| 64 |
- https://github.com/llvm/llvm-project/archive/llvmorg-${PV/_/-}.tar.gz |
| 65 |
- " |
| 66 |
- fi |
| 67 |
+ SRC_URI+=" |
| 68 |
+ https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV/_/-}/llvm-project-${PV/_/}.src.tar.xz |
| 69 |
+ verify-sig? ( |
| 70 |
+ https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV/_/-}/llvm-project-${PV/_/}.src.tar.xz.sig |
| 71 |
+ ) |
| 72 |
+ " |
| 73 |
+ BDEPEND+=" |
| 74 |
+ verify-sig? ( |
| 75 |
+ >=sec-keys/openpgp-keys-llvm-15 |
| 76 |
+ ) |
| 77 |
+ " |
| 78 |
+ VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/llvm.asc |
| 79 |
;; |
| 80 |
snapshot) |
| 81 |
SRC_URI+=" |
| 82 |
@@ -363,25 +347,16 @@ llvm.org_src_unpack() { |
| 83 |
git-r3_checkout '' . '' "${components[@]}" |
| 84 |
;; |
| 85 |
tar) |
| 86 |
- archive=llvmorg-${PV/_/-}.tar.gz |
| 87 |
- if ver_test -ge 14.0.5; then |
| 88 |
- archive=llvm-project-${PV/_/}.src.tar.xz |
| 89 |
- if use verify-sig; then |
| 90 |
- verify-sig_verify_detached \ |
| 91 |
- "${DISTDIR}/${archive}" "${DISTDIR}/${archive}.sig" |
| 92 |
- fi |
| 93 |
+ archive=llvm-project-${PV/_/}.src.tar.xz |
| 94 |
+ if use verify-sig; then |
| 95 |
+ verify-sig_verify_detached \ |
| 96 |
+ "${DISTDIR}/${archive}" "${DISTDIR}/${archive}.sig" |
| 97 |
fi |
| 98 |
|
| 99 |
ebegin "Unpacking from ${archive}" |
| 100 |
- if ver_test -ge 14.0.5; then |
| 101 |
- tar -x -J -o --strip-components 1 \ |
| 102 |
- -f "${DISTDIR}/${archive}" \ |
| 103 |
- "${components[@]/#/${archive%.tar*}/}" || die |
| 104 |
- else |
| 105 |
- tar -x -z -o --strip-components 1 \ |
| 106 |
- -f "${DISTDIR}/${archive}" \ |
| 107 |
- "${components[@]/#/llvm-project-${archive%.tar*}/}" || die |
| 108 |
- fi |
| 109 |
+ tar -x -J -o --strip-components 1 \ |
| 110 |
+ -f "${DISTDIR}/${archive}" \ |
| 111 |
+ "${components[@]/#/${archive%.tar*}/}" || die |
| 112 |
eend ${?} |
| 113 |
;; |
| 114 |
snapshot) |
Archives