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 11EF815815E for ; Sat, 10 Feb 2024 11:13:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EBDACE2B23; Sat, 10 Feb 2024 11:13:17 +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 C23C7E2B23 for ; Sat, 10 Feb 2024 11:13:17 +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 BC1E23431D3 for ; Sat, 10 Feb 2024 11:13:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2442D14CB for ; Sat, 10 Feb 2024 11:13:15 +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: <1707563586.912953a0c105a00f2e58d65e6db3e9d67f7f1878.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/compiler-rt/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/compiler-rt/compiler-rt-18.1.0_rc2.ebuild sys-libs/compiler-rt/compiler-rt-19.0.0.9999.ebuild sys-libs/compiler-rt/compiler-rt-19.0.0_pre20240203.ebuild X-VCS-Directories: sys-libs/compiler-rt/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 912953a0c105a00f2e58d65e6db3e9d67f7f1878 X-VCS-Branch: master Date: Sat, 10 Feb 2024 11:13:15 +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: 21f074ce-68f9-4c45-9c40-4d40259895f4 X-Archives-Hash: 73f66d4977a1657d2b3e2f5806557b0e commit: 912953a0c105a00f2e58d65e6db3e9d67f7f1878 Author: Michał Górny gentoo org> AuthorDate: Sat Feb 10 10:59:37 2024 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat Feb 10 11:13:06 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=912953a0 sys-libs/compiler-rt: Migrate to llvm-utils Signed-off-by: Michał Górny gentoo.org> sys-libs/compiler-rt/compiler-rt-18.1.0_rc2.ebuild | 12 ++++-------- sys-libs/compiler-rt/compiler-rt-19.0.0.9999.ebuild | 12 ++++-------- sys-libs/compiler-rt/compiler-rt-19.0.0_pre20240203.ebuild | 12 ++++-------- 3 files changed, 12 insertions(+), 24 deletions(-) diff --git a/sys-libs/compiler-rt/compiler-rt-18.1.0_rc2.ebuild b/sys-libs/compiler-rt/compiler-rt-18.1.0_rc2.ebuild index 364ccbcca438..75ff3c155c03 100644 --- a/sys-libs/compiler-rt/compiler-rt-18.1.0_rc2.ebuild +++ b/sys-libs/compiler-rt/compiler-rt-18.1.0_rc2.ebuild @@ -4,7 +4,8 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..12} ) -inherit cmake crossdev flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs +inherit cmake crossdev flag-o-matic llvm.org llvm-utils python-any-r1 +inherit toolchain-funcs DESCRIPTION="Compiler runtime library for clang (built-in part)" HOMEPAGE="https://llvm.org/" @@ -44,13 +45,6 @@ pkg_pretend() { } pkg_setup() { - # Darwin Prefix builds do not have llvm installed yet, so rely on - # bootstrap-prefix to set the appropriate path vars to LLVM instead - # of using llvm_pkg_setup. - if [[ ${CHOST} != *-darwin* ]] || has_version sys-devel/llvm; then - LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup - fi - if target_is_not_host || tc-is-cross-compiler ; then # strips vars like CFLAGS="-march=x86_64-v3" for non-x86 architectures CHOST=${CTARGET} strip-unsupported-flags @@ -67,6 +61,8 @@ test_compiler() { } src_configure() { + llvm_prepend_path "${LLVM_MAJOR}" + # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844 use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG" diff --git a/sys-libs/compiler-rt/compiler-rt-19.0.0.9999.ebuild b/sys-libs/compiler-rt/compiler-rt-19.0.0.9999.ebuild index 364ccbcca438..75ff3c155c03 100644 --- a/sys-libs/compiler-rt/compiler-rt-19.0.0.9999.ebuild +++ b/sys-libs/compiler-rt/compiler-rt-19.0.0.9999.ebuild @@ -4,7 +4,8 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..12} ) -inherit cmake crossdev flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs +inherit cmake crossdev flag-o-matic llvm.org llvm-utils python-any-r1 +inherit toolchain-funcs DESCRIPTION="Compiler runtime library for clang (built-in part)" HOMEPAGE="https://llvm.org/" @@ -44,13 +45,6 @@ pkg_pretend() { } pkg_setup() { - # Darwin Prefix builds do not have llvm installed yet, so rely on - # bootstrap-prefix to set the appropriate path vars to LLVM instead - # of using llvm_pkg_setup. - if [[ ${CHOST} != *-darwin* ]] || has_version sys-devel/llvm; then - LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup - fi - if target_is_not_host || tc-is-cross-compiler ; then # strips vars like CFLAGS="-march=x86_64-v3" for non-x86 architectures CHOST=${CTARGET} strip-unsupported-flags @@ -67,6 +61,8 @@ test_compiler() { } src_configure() { + llvm_prepend_path "${LLVM_MAJOR}" + # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844 use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG" diff --git a/sys-libs/compiler-rt/compiler-rt-19.0.0_pre20240203.ebuild b/sys-libs/compiler-rt/compiler-rt-19.0.0_pre20240203.ebuild index 364ccbcca438..75ff3c155c03 100644 --- a/sys-libs/compiler-rt/compiler-rt-19.0.0_pre20240203.ebuild +++ b/sys-libs/compiler-rt/compiler-rt-19.0.0_pre20240203.ebuild @@ -4,7 +4,8 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..12} ) -inherit cmake crossdev flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs +inherit cmake crossdev flag-o-matic llvm.org llvm-utils python-any-r1 +inherit toolchain-funcs DESCRIPTION="Compiler runtime library for clang (built-in part)" HOMEPAGE="https://llvm.org/" @@ -44,13 +45,6 @@ pkg_pretend() { } pkg_setup() { - # Darwin Prefix builds do not have llvm installed yet, so rely on - # bootstrap-prefix to set the appropriate path vars to LLVM instead - # of using llvm_pkg_setup. - if [[ ${CHOST} != *-darwin* ]] || has_version sys-devel/llvm; then - LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup - fi - if target_is_not_host || tc-is-cross-compiler ; then # strips vars like CFLAGS="-march=x86_64-v3" for non-x86 architectures CHOST=${CTARGET} strip-unsupported-flags @@ -67,6 +61,8 @@ test_compiler() { } src_configure() { + llvm_prepend_path "${LLVM_MAJOR}" + # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844 use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"