diff options
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/Manifest.gz | bin | 38329 -> 38324 bytes | |||
| -rw-r--r-- | eclass/llvm.org.eclass | 18 |
2 files changed, 6 insertions, 12 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex f1f0249a2669..b53840796975 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz diff --git a/eclass/llvm.org.eclass b/eclass/llvm.org.eclass index 3f4b4d29a7b9..a3c268dfef80 100644 --- a/eclass/llvm.org.eclass +++ b/eclass/llvm.org.eclass @@ -52,12 +52,12 @@ LLVM_VERSION=$(ver_cut 1-3) # == internal control bits == -# @ECLASS_VARIABLE: _LLVM_MASTER_MAJOR +# @ECLASS_VARIABLE: _LLVM_MAIN_MAJOR # @INTERNAL # @DESCRIPTION: # The major version of current LLVM trunk. Used to determine # the correct branch to use. -_LLVM_MASTER_MAJOR=17 +_LLVM_MAIN_MAJOR=18 # @ECLASS_VARIABLE: _LLVM_SOURCE_TYPE # @INTERNAL @@ -75,12 +75,6 @@ if [[ -z ${_LLVM_SOURCE_TYPE+1} ]]; then 17.0.0_pre20230722) EGIT_COMMIT=5f1a388a11ae67c2e5d7a4d1fe45e369a393c572 ;; - 17.0.0_pre20230717) - EGIT_COMMIT=3cd3f11c174baa001b337b88c7a6507eb5705cf2 - ;; - 17.0.0_pre20230705) - EGIT_COMMIT=5ae7fde004cbc640c2f60207791ac36574e5f5c6 - ;; *) die "Unknown snapshot: ${PV}" ;; @@ -95,8 +89,8 @@ fi [[ ${_LLVM_SOURCE_TYPE} == git ]] && inherit git-r3 -[[ ${LLVM_MAJOR} == ${_LLVM_MASTER_MAJOR} && ${_LLVM_SOURCE_TYPE} == tar ]] && - die "${ECLASS}: Release ebuild for master branch?!" +[[ ${LLVM_MAJOR} == ${_LLVM_MAIN_MAJOR} && ${_LLVM_SOURCE_TYPE} == tar ]] && + die "${ECLASS}: Release ebuild for main branch?!" inherit multiprocessing @@ -211,7 +205,7 @@ ALL_LLVM_TARGET_FLAGS=( # as a subslot. This is equal to LLVM_MAJOR for releases, and to PV # for the main branch. LLVM_SOABI=${LLVM_MAJOR} -[[ ${LLVM_MAJOR} == ${_LLVM_MASTER_MAJOR} ]] && LLVM_SOABI=${PV} +[[ ${LLVM_MAJOR} == ${_LLVM_MAIN_MAJOR} ]] && LLVM_SOABI=${PV} # == global scope logic == @@ -233,7 +227,7 @@ llvm.org_set_globals() { git) EGIT_REPO_URI="https://github.com/llvm/llvm-project.git" - [[ ${LLVM_MAJOR} != ${_LLVM_MASTER_MAJOR} ]] && + [[ ${LLVM_MAJOR} != ${_LLVM_MAIN_MAJOR} ]] && EGIT_BRANCH="release/${LLVM_MAJOR}.x" ;; tar) |