diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-02-01 09:04:22 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-02-01 09:04:22 +0000 |
| commit | d88834e7a12432c4e2d04ca7e938a66e25811f89 (patch) | |
| tree | 9e31e0c72268908e8433ccfd6384a039525c1a32 /eclass | |
| parent | 7414e061f0ef8e77eaa6de051a83181cddbef1dc (diff) | |
gentoo auto-resync : 01:02:2023 - 09:04:21
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/Manifest.gz | bin | 37361 -> 37357 bytes | |||
| -rw-r--r-- | eclass/llvm.org.eclass | 65 |
2 files changed, 20 insertions, 45 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex 8dd7458226c7..8819b95ed723 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz diff --git a/eclass/llvm.org.eclass b/eclass/llvm.org.eclass index da243ac01b35..636ccea076f8 100644 --- a/eclass/llvm.org.eclass +++ b/eclass/llvm.org.eclass @@ -106,7 +106,7 @@ fi inherit multiprocessing -if [[ ${_LLVM_SOURCE_TYPE} == tar ]] && ver_test -ge 14.0.5; then +if [[ ${_LLVM_SOURCE_TYPE} == tar ]]; then inherit verify-sig fi @@ -177,16 +177,6 @@ fi # version. The value depends on ${PV}. case ${LLVM_MAJOR} in - 10|11|12) - # this API is not present for old LLVM versions - ;; - 13) - ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY M68k VE ) - ALL_LLVM_PRODUCTION_TARGETS=( - AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430 NVPTX - PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore - ) - ;; 14) ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY M68k ) ALL_LLVM_PRODUCTION_TARGETS=( @@ -253,24 +243,18 @@ llvm.org_set_globals() { EGIT_BRANCH="release/${LLVM_MAJOR}.x" ;; tar) - if ver_test -ge 14.0.5; then - SRC_URI+=" - https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV/_/-}/llvm-project-${PV/_/}.src.tar.xz - verify-sig? ( - https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV/_/-}/llvm-project-${PV/_/}.src.tar.xz.sig - ) - " - BDEPEND+=" - verify-sig? ( - >=sec-keys/openpgp-keys-llvm-15 - ) - " - VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/llvm.asc - else - SRC_URI+=" - https://github.com/llvm/llvm-project/archive/llvmorg-${PV/_/-}.tar.gz - " - fi + SRC_URI+=" + https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV/_/-}/llvm-project-${PV/_/}.src.tar.xz + verify-sig? ( + https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV/_/-}/llvm-project-${PV/_/}.src.tar.xz.sig + ) + " + BDEPEND+=" + verify-sig? ( + >=sec-keys/openpgp-keys-llvm-15 + ) + " + VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/llvm.asc ;; snapshot) SRC_URI+=" @@ -363,25 +347,16 @@ llvm.org_src_unpack() { git-r3_checkout '' . '' "${components[@]}" ;; tar) - archive=llvmorg-${PV/_/-}.tar.gz - if ver_test -ge 14.0.5; then - archive=llvm-project-${PV/_/}.src.tar.xz - if use verify-sig; then - verify-sig_verify_detached \ - "${DISTDIR}/${archive}" "${DISTDIR}/${archive}.sig" - fi + archive=llvm-project-${PV/_/}.src.tar.xz + if use verify-sig; then + verify-sig_verify_detached \ + "${DISTDIR}/${archive}" "${DISTDIR}/${archive}.sig" fi ebegin "Unpacking from ${archive}" - if ver_test -ge 14.0.5; then - tar -x -J -o --strip-components 1 \ - -f "${DISTDIR}/${archive}" \ - "${components[@]/#/${archive%.tar*}/}" || die - else - tar -x -z -o --strip-components 1 \ - -f "${DISTDIR}/${archive}" \ - "${components[@]/#/llvm-project-${archive%.tar*}/}" || die - fi + tar -x -J -o --strip-components 1 \ + -f "${DISTDIR}/${archive}" \ + "${components[@]/#/${archive%.tar*}/}" || die eend ${?} ;; snapshot) |