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 C44FB158094 for ; Mon, 10 Oct 2022 20:52:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AE471E08ED; Mon, 10 Oct 2022 20:52:46 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 8C7AFE08CD for ; Mon, 10 Oct 2022 20:52:46 +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 83AB1341040 for ; Mon, 10 Oct 2022 20:52:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CD7C5608 for ; Mon, 10 Oct 2022 20:52:43 +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: <1665435157.dbc5f4c188646927815d288e746e5b3fe7615719.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-13.0.1.ebuild sys-devel/llvm/llvm-14.0.6-r2.ebuild sys-devel/llvm/llvm-15.0.2.ebuild sys-devel/llvm/llvm-15.0.3.9999.ebuild sys-devel/llvm/llvm-16.0.0.9999.ebuild sys-devel/llvm/llvm-16.0.0_pre20221006.ebuild sys-devel/llvm/llvm-16.0.0_pre20221010.ebuild X-VCS-Directories: sys-devel/llvm/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: dbc5f4c188646927815d288e746e5b3fe7615719 X-VCS-Branch: master Date: Mon, 10 Oct 2022 20:52:43 +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: d9bbc870-8e42-4d9d-873d-bb1ae2487b8c X-Archives-Hash: bf6f06a3c189ebd80e8791bbf53a9594 commit: dbc5f4c188646927815d288e746e5b3fe7615719 Author: Michał Górny gentoo org> AuthorDate: Mon Oct 10 20:32:09 2022 +0000 Commit: Michał Górny gentoo org> CommitDate: Mon Oct 10 20:52:37 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbc5f4c1 sys-devel/llvm: Use tc-get-cxx-stdlib Signed-off-by: Michał Górny gentoo.org> sys-devel/llvm/llvm-13.0.1.ebuild | 14 +------------- sys-devel/llvm/llvm-14.0.6-r2.ebuild | 14 +------------- sys-devel/llvm/llvm-15.0.2.ebuild | 14 +------------- sys-devel/llvm/llvm-15.0.3.9999.ebuild | 14 +------------- sys-devel/llvm/llvm-16.0.0.9999.ebuild | 14 +------------- sys-devel/llvm/llvm-16.0.0_pre20221006.ebuild | 14 +------------- sys-devel/llvm/llvm-16.0.0_pre20221010.ebuild | 14 +------------- 7 files changed, 7 insertions(+), 91 deletions(-) diff --git a/sys-devel/llvm/llvm-13.0.1.ebuild b/sys-devel/llvm/llvm-13.0.1.ebuild index 2d52bf8cfe60..598476d25566 100644 --- a/sys-devel/llvm/llvm-13.0.1.ebuild +++ b/sys-devel/llvm/llvm-13.0.1.ebuild @@ -174,18 +174,6 @@ src_prepare() { llvm.org_src_prepare } -# Is LLVM being linked against libc++? -is_libcxx_linked() { - local code='#include -#if defined(_LIBCPP_VERSION) - HAVE_LIBCXX -#endif -' - local out=$($(tc-getCXX) ${CXXFLAGS} ${CPPFLAGS} -x c++ -E -P - <<<"${code}") || return 1 - - [[ ${out} == *HAVE_LIBCXX* ]] -} - get_distribution_components() { local sep=${1-;} @@ -367,7 +355,7 @@ multilib_src_configure() { -DOCAMLFIND=NO ) - if is_libcxx_linked; then + if [[ $(tc-get-cxx-stdlib) == libc++ ]]; 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. diff --git a/sys-devel/llvm/llvm-14.0.6-r2.ebuild b/sys-devel/llvm/llvm-14.0.6-r2.ebuild index 01b9bbfd4b9d..0f53397cf7ae 100644 --- a/sys-devel/llvm/llvm-14.0.6-r2.ebuild +++ b/sys-devel/llvm/llvm-14.0.6-r2.ebuild @@ -186,18 +186,6 @@ src_prepare() { rm test/Other/ChangePrinters/DotCfg/print-changed-dot-cfg.ll || die } -# Is LLVM being linked against libc++? -is_libcxx_linked() { - local code='#include -#if defined(_LIBCPP_VERSION) - HAVE_LIBCXX -#endif -' - local out=$($(tc-getCXX) ${CXXFLAGS} ${CPPFLAGS} -x c++ -E -P - <<<"${code}") || return 1 - - [[ ${out} == *HAVE_LIBCXX* ]] -} - get_distribution_components() { local sep=${1-;} @@ -381,7 +369,7 @@ multilib_src_configure() { -DOCAMLFIND=NO ) - if is_libcxx_linked; then + if [[ $(tc-get-cxx-stdlib) == libc++ ]]; 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. diff --git a/sys-devel/llvm/llvm-15.0.2.ebuild b/sys-devel/llvm/llvm-15.0.2.ebuild index 5f8f61bdd695..79d2ff39fb45 100644 --- a/sys-devel/llvm/llvm-15.0.2.ebuild +++ b/sys-devel/llvm/llvm-15.0.2.ebuild @@ -180,18 +180,6 @@ src_prepare() { llvm.org_src_prepare } -# Is LLVM being linked against libc++? -is_libcxx_linked() { - local code='#include -#if defined(_LIBCPP_VERSION) - HAVE_LIBCXX -#endif -' - local out=$($(tc-getCXX) ${CXXFLAGS} ${CPPFLAGS} -x c++ -E -P - <<<"${code}") || return 1 - - [[ ${out} == *HAVE_LIBCXX* ]] -} - get_distribution_components() { local sep=${1-;} @@ -379,7 +367,7 @@ multilib_src_configure() { -DOCAMLFIND=NO ) - if is_libcxx_linked; then + if [[ $(tc-get-cxx-stdlib) == libc++ ]]; 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. diff --git a/sys-devel/llvm/llvm-15.0.3.9999.ebuild b/sys-devel/llvm/llvm-15.0.3.9999.ebuild index 010e27a1349e..1f47134cba77 100644 --- a/sys-devel/llvm/llvm-15.0.3.9999.ebuild +++ b/sys-devel/llvm/llvm-15.0.3.9999.ebuild @@ -180,18 +180,6 @@ src_prepare() { llvm.org_src_prepare } -# Is LLVM being linked against libc++? -is_libcxx_linked() { - local code='#include -#if defined(_LIBCPP_VERSION) - HAVE_LIBCXX -#endif -' - local out=$($(tc-getCXX) ${CXXFLAGS} ${CPPFLAGS} -x c++ -E -P - <<<"${code}") || return 1 - - [[ ${out} == *HAVE_LIBCXX* ]] -} - get_distribution_components() { local sep=${1-;} @@ -379,7 +367,7 @@ multilib_src_configure() { -DOCAMLFIND=NO ) - if is_libcxx_linked; then + if [[ $(tc-get-cxx-stdlib) == libc++ ]]; 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. diff --git a/sys-devel/llvm/llvm-16.0.0.9999.ebuild b/sys-devel/llvm/llvm-16.0.0.9999.ebuild index 946713e022db..4eebbc15117c 100644 --- a/sys-devel/llvm/llvm-16.0.0.9999.ebuild +++ b/sys-devel/llvm/llvm-16.0.0.9999.ebuild @@ -184,18 +184,6 @@ src_prepare() { llvm.org_src_prepare } -# Is LLVM being linked against libc++? -is_libcxx_linked() { - local code='#include -#if defined(_LIBCPP_VERSION) - HAVE_LIBCXX -#endif -' - local out=$($(tc-getCXX) ${CXXFLAGS} ${CPPFLAGS} -x c++ -E -P - <<<"${code}") || return 1 - - [[ ${out} == *HAVE_LIBCXX* ]] -} - get_distribution_components() { local sep=${1-;} @@ -391,7 +379,7 @@ multilib_src_configure() { # the commit id in the SOVERSION to contain the breakage suffix+="git${EGIT_VERSION::8}" fi - if is_libcxx_linked; then + if [[ $(tc-get-cxx-stdlib) == libc++ ]]; 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. diff --git a/sys-devel/llvm/llvm-16.0.0_pre20221006.ebuild b/sys-devel/llvm/llvm-16.0.0_pre20221006.ebuild index fef201259b9f..91463ab2ffbd 100644 --- a/sys-devel/llvm/llvm-16.0.0_pre20221006.ebuild +++ b/sys-devel/llvm/llvm-16.0.0_pre20221006.ebuild @@ -184,18 +184,6 @@ src_prepare() { llvm.org_src_prepare } -# Is LLVM being linked against libc++? -is_libcxx_linked() { - local code='#include -#if defined(_LIBCPP_VERSION) - HAVE_LIBCXX -#endif -' - local out=$($(tc-getCXX) ${CXXFLAGS} ${CPPFLAGS} -x c++ -E -P - <<<"${code}") || return 1 - - [[ ${out} == *HAVE_LIBCXX* ]] -} - get_distribution_components() { local sep=${1-;} @@ -391,7 +379,7 @@ multilib_src_configure() { # the commit id in the SOVERSION to contain the breakage suffix+="git${EGIT_VERSION::8}" fi - if is_libcxx_linked; then + if [[ $(tc-get-cxx-stdlib) == libc++ ]]; 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. diff --git a/sys-devel/llvm/llvm-16.0.0_pre20221010.ebuild b/sys-devel/llvm/llvm-16.0.0_pre20221010.ebuild index 946713e022db..4eebbc15117c 100644 --- a/sys-devel/llvm/llvm-16.0.0_pre20221010.ebuild +++ b/sys-devel/llvm/llvm-16.0.0_pre20221010.ebuild @@ -184,18 +184,6 @@ src_prepare() { llvm.org_src_prepare } -# Is LLVM being linked against libc++? -is_libcxx_linked() { - local code='#include -#if defined(_LIBCPP_VERSION) - HAVE_LIBCXX -#endif -' - local out=$($(tc-getCXX) ${CXXFLAGS} ${CPPFLAGS} -x c++ -E -P - <<<"${code}") || return 1 - - [[ ${out} == *HAVE_LIBCXX* ]] -} - get_distribution_components() { local sep=${1-;} @@ -391,7 +379,7 @@ multilib_src_configure() { # the commit id in the SOVERSION to contain the breakage suffix+="git${EGIT_VERSION::8}" fi - if is_libcxx_linked; then + if [[ $(tc-get-cxx-stdlib) == libc++ ]]; 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.