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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 972A9158094 for ; Fri, 7 Oct 2022 13:42:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E9F83E085E; Fri, 7 Oct 2022 13:42:53 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 BF9B4E085B for ; Fri, 7 Oct 2022 13:42:53 +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 D8CDB340D87 for ; Fri, 7 Oct 2022 13:42:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 31C1E603 for ; Fri, 7 Oct 2022 13:42:51 +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: <1665149892.c5246513ad3ef0044d063f5bb5a0246f8cc9cd1a.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-devel/llvm/llvm-16.0.0.9999.ebuild sys-devel/llvm/llvm-16.0.0_pre20221006.ebuild X-VCS-Directories: sys-devel/llvm/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: c5246513ad3ef0044d063f5bb5a0246f8cc9cd1a X-VCS-Branch: master Date: Fri, 7 Oct 2022 13:42:51 +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: 75682cfe-fe98-4c64-a565-0408187b5661 X-Archives-Hash: fa2a635b22907023fc593fc1e1b9a9a2 commit: c5246513ad3ef0044d063f5bb5a0246f8cc9cd1a Author: Michał Górny gentoo org> AuthorDate: Fri Oct 7 13:26:04 2022 +0000 Commit: Michał Górny gentoo org> CommitDate: Fri Oct 7 13:38:12 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5246513 sys-devel/llvm: Add git commit id to SOVERSION suffix for 16.x Include a shortened git commit id in the LLVM version suffix of live and snapshot ebuilds of 16.x branch. Since the ABI of this branch is not yet stable, using unique SOVERSIONs can avoid immediate breakage when using the same clang version as the compiler. Signed-off-by: Michał Górny gentoo.org> sys-devel/llvm/llvm-16.0.0.9999.ebuild | 11 ++++++++++- sys-devel/llvm/llvm-16.0.0_pre20221006.ebuild | 11 ++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/sys-devel/llvm/llvm-16.0.0.9999.ebuild b/sys-devel/llvm/llvm-16.0.0.9999.ebuild index b306d267303c..63c986a698a5 100644 --- a/sys-devel/llvm/llvm-16.0.0.9999.ebuild +++ b/sys-devel/llvm/llvm-16.0.0.9999.ebuild @@ -385,15 +385,24 @@ multilib_src_configure() { -DOCAMLFIND=NO ) + local suffix= + if [[ -n ${EGIT_VERSION} && ${EGIT_BRANCH} != release/* ]]; then + # the ABI of the main branch is not stable, so let's include + # the commit id in the SOVERSION to contain the breakage + suffix+="git${EGIT_VERSION::8}" + fi if is_libcxx_linked; then # Smart hack: alter version suffix -> SOVERSION when linking # against libc++. This way we won't end up mixing LLVM libc++ # libraries with libstdc++ clang, and the other way around. + suffix+="+libcxx" mycmakeargs+=( - -DLLVM_VERSION_SUFFIX="libcxx" -DLLVM_ENABLE_LIBCXX=ON ) fi + mycmakeargs+=( + -DLLVM_VERSION_SUFFIX="${suffix}" + ) # Note: go bindings have no CMake rules at the moment # but let's kill the check in case they are introduced diff --git a/sys-devel/llvm/llvm-16.0.0_pre20221006.ebuild b/sys-devel/llvm/llvm-16.0.0_pre20221006.ebuild index b306d267303c..63c986a698a5 100644 --- a/sys-devel/llvm/llvm-16.0.0_pre20221006.ebuild +++ b/sys-devel/llvm/llvm-16.0.0_pre20221006.ebuild @@ -385,15 +385,24 @@ multilib_src_configure() { -DOCAMLFIND=NO ) + local suffix= + if [[ -n ${EGIT_VERSION} && ${EGIT_BRANCH} != release/* ]]; then + # the ABI of the main branch is not stable, so let's include + # the commit id in the SOVERSION to contain the breakage + suffix+="git${EGIT_VERSION::8}" + fi if is_libcxx_linked; then # Smart hack: alter version suffix -> SOVERSION when linking # against libc++. This way we won't end up mixing LLVM libc++ # libraries with libstdc++ clang, and the other way around. + suffix+="+libcxx" mycmakeargs+=( - -DLLVM_VERSION_SUFFIX="libcxx" -DLLVM_ENABLE_LIBCXX=ON ) fi + mycmakeargs+=( + -DLLVM_VERSION_SUFFIX="${suffix}" + ) # Note: go bindings have no CMake rules at the moment # but let's kill the check in case they are introduced