From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5518415800A for ; Tue, 25 Jul 2023 16:11:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8FB33E086E; Tue, 25 Jul 2023 16:11:42 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 756E9E086E for ; Tue, 25 Jul 2023 16:11:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A4FF63414D8 for ; Tue, 25 Jul 2023 16:11:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 105CEDC8 for ; Tue, 25 Jul 2023 16:11:40 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1690301477.39ea1f5cbb12c9bb5087fc17a98f552173ad6401.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/llvm.org.eclass X-VCS-Directories: eclass/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 39ea1f5cbb12c9bb5087fc17a98f552173ad6401 X-VCS-Branch: master Date: Tue, 25 Jul 2023 16:11:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c2b9addf-bfaf-4a2e-b3d8-c10e46be4c55 X-Archives-Hash: b0e5e07b517d6377676c55b486913809 commit: 39ea1f5cbb12c9bb5087fc17a98f552173ad6401 Author: Michał Górny gentoo org> AuthorDate: Tue Jul 25 16:05:42 2023 +0000 Commit: Michał Górny gentoo org> CommitDate: Tue Jul 25 16:11:17 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39ea1f5c llvm.org.eclass: master → main Signed-off-by: Michał Górny gentoo.org> eclass/llvm.org.eclass | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/eclass/llvm.org.eclass b/eclass/llvm.org.eclass index 765619b8a043..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=18 +_LLVM_MAIN_MAJOR=18 # @ECLASS_VARIABLE: _LLVM_SOURCE_TYPE # @INTERNAL @@ -89,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 @@ -205,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 == @@ -227,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)