diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-07-24 02:11:45 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-07-24 02:11:45 +0100 |
commit | b49088575eb777ced2551f484da86317332d6087 (patch) | |
tree | bf9a151cf2d61956340d555659ffc098ee1da466 /eclass/llvm.org.eclass | |
parent | 514d1bbe260df2521fe60f1a3ec87cfcfde1a829 (diff) |
gentoo resync : 24.07.2021
Diffstat (limited to 'eclass/llvm.org.eclass')
-rw-r--r-- | eclass/llvm.org.eclass | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/eclass/llvm.org.eclass b/eclass/llvm.org.eclass index 7f4aa723e0a5..83f8127a4bd7 100644 --- a/eclass/llvm.org.eclass +++ b/eclass/llvm.org.eclass @@ -6,7 +6,7 @@ # Michał Górny <mgorny@gentoo.org> # @AUTHOR: # Michał Górny <mgorny@gentoo.org> -# @SUPPORTED_EAPIS: 7 +# @SUPPORTED_EAPIS: 7 8 # @BLURB: Common bits for fetching & unpacking llvm.org projects # @DESCRIPTION: # The llvm.org eclass provides common code to fetch and unpack parts @@ -30,7 +30,7 @@ # @CODE case "${EAPI:-0}" in - 7) + 7|8) ;; *) die "Unsupported EAPI=${EAPI} for ${ECLASS}" @@ -167,10 +167,7 @@ llvm.org_set_globals() { # == phase functions == -EXPORT_FUNCTIONS src_unpack -if ver_test -ge 10.0.1_rc; then - EXPORT_FUNCTIONS src_prepare -fi +EXPORT_FUNCTIONS src_unpack src_prepare # @FUNCTION: llvm.org_src_unpack # @DESCRIPTION: @@ -205,6 +202,12 @@ llvm.org_src_unpack() { fi if [[ -n ${LLVM_PATCHSET} ]]; then + local nocomp=$(grep -r -L "^Gentoo-Component:" \ + "${WORKDIR}/llvm-gentoo-patchset-${LLVM_PATCHSET}") + if [[ -n ${nocomp} ]]; then + die "Patches lacking Gentoo-Component found: ${nocomp}" + fi + # strip patches that don't match current components local IFS='|' grep -E -r -L "^Gentoo-Component:.*(${components[*]})" \ |