From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6E5481580EB for ; Wed, 28 May 2025 10:50:53 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 5BF7B343105 for ; Wed, 28 May 2025 10:50:53 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id E95A3110497; Wed, 28 May 2025 10:50:44 +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)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id D7837110497 for ; Wed, 28 May 2025 10:50:44 +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 87152343105 for ; Wed, 28 May 2025 10:50:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EC5BE28F0 for ; Wed, 28 May 2025 10:50:42 +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: <1748429294.0a6d75f980eae3bc2e3f6f04c8278cfa54774cfa.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: llvm-runtimes/libgcc/ X-VCS-Repository: repo/gentoo X-VCS-Files: llvm-runtimes/libgcc/Manifest llvm-runtimes/libgcc/libgcc-21.0.0_pre20250510.ebuild llvm-runtimes/libgcc/libgcc-21.0.0_pre20250517.ebuild X-VCS-Directories: llvm-runtimes/libgcc/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 0a6d75f980eae3bc2e3f6f04c8278cfa54774cfa X-VCS-Branch: master Date: Wed, 28 May 2025 10:50:42 +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: 893f130a-e049-4966-9004-ba872e6a88a1 X-Archives-Hash: e82a3b32bb558d9b528718ed240303d1 commit: 0a6d75f980eae3bc2e3f6f04c8278cfa54774cfa Author: Michał Górny gentoo org> AuthorDate: Wed May 28 10:48:14 2025 +0000 Commit: Michał Górny gentoo org> CommitDate: Wed May 28 10:48:14 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a6d75f9 llvm-runtimes/libgcc: Remove old Signed-off-by: Michał Górny gentoo.org> llvm-runtimes/libgcc/Manifest | 2 - .../libgcc/libgcc-21.0.0_pre20250510.ebuild | 172 --------------------- .../libgcc/libgcc-21.0.0_pre20250517.ebuild | 172 --------------------- 3 files changed, 346 deletions(-) diff --git a/llvm-runtimes/libgcc/Manifest b/llvm-runtimes/libgcc/Manifest index fe6e52b83c13..506f98b7adde 100644 --- a/llvm-runtimes/libgcc/Manifest +++ b/llvm-runtimes/libgcc/Manifest @@ -3,5 +3,3 @@ DIST llvm-project-19.1.7.src.tar.xz.sig 438 BLAKE2B 4015140f4ba77de45039bdbdfbaf DIST llvm-project-20.1.5.src.tar.xz 147239812 BLAKE2B 992ebec16a11f32f234ba8b9f228f27939cdaeaaba474a08da2564ba3075bb10ab92a44be704666bdd77f8294321d43da40bb9245c411a86cd53cff88223a91f SHA512 3b7e657714fa9b943c75ec9eeb903018ab4713b1c3370746ba68893220729f178dabb971515741519f24e7ad0fa1dbce1345572bcf1d1fc1e5de97e4d2900a6b DIST llvm-project-20.1.5.src.tar.xz.sig 566 BLAKE2B c8be202b475726817893e1fe5fe2d3ab02ea1d3130ccfdf4c2c29b46e6aef79091de78e8a9aef59416ac1120bb3af6fdf47464db9b27b8fb4cb4194b0444e571 SHA512 c1bd30af5f7bfa6cac73994e9068d2791d9d27e86375fb15ad426422ad00cb43ade226c1b91ecc7daa950efae62c86300e4290d59649310f4e8fab5bdcb264fe DIST llvm-project-7dc7c155251c0008d5d59b84f0c9056365740f11.tar.gz 235921149 BLAKE2B 2867e313cd25fee6975da9bf65365fa51ed8780f3f8fc95983fb6e8f5b2c38c6d7f75a386b0ec2d74bafad74472973f4e4e603a5a0754465ac2b75942b8e90c6 SHA512 f8bc383ff2a1af836357150efa5728c7df3cd862f56ffaf12b5fc56ef631f1048276ff00b89fcf4d224576fa1eda9811d971886aae0855a4d29178060eb89a49 -DIST llvm-project-aaaae99663dbb220c6c27fa9cacf93fcb8f20e7c.tar.gz 235477577 BLAKE2B 46a3b7863cdfde75045dfcab95f8c9eee21f8ce80cee700284bc174adbb4038f23bba3b15635c88c2723ed0d20e6fddcf43c92b9e540c885af48e81bfa8c82aa SHA512 bf8e7f28622f91da57698220fca592105d109c38801b5e0312f5e290bca1ae32ef393179cfe912c194dbf85ece9bd6ee63b587157b0fcd6007bbaff3324e77ed -DIST llvm-project-fcb4bda9dcfcdb64d8b069e8416c75d7a1a62e52.tar.gz 233149231 BLAKE2B 95a7a012a1e747afcf83ace3785c8ef6a3e10f6075e59eb1c5b077cc9edae244b648f341bc0ac6a45b2afc8f7ffe130a90a741a04465523f30f8322566386703 SHA512 b46f0c90a1c56750cada24183ca382b267a2d2faa0db7d77a8bdd4e94e6303e57d565cf85447b3c0e0efdd3750efef1e10e8ce6f1fe8f1ae10ee31d25ddf3fb7 diff --git a/llvm-runtimes/libgcc/libgcc-21.0.0_pre20250510.ebuild b/llvm-runtimes/libgcc/libgcc-21.0.0_pre20250510.ebuild deleted file mode 100644 index 2c2ae9d40376..000000000000 --- a/llvm-runtimes/libgcc/libgcc-21.0.0_pre20250510.ebuild +++ /dev/null @@ -1,172 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..13} ) - -inherit cmake crossdev flag-o-matic llvm.org llvm-utils python-any-r1 -inherit toolchain-funcs - -DESCRIPTION="Compiler runtime library for clang, compatible with libgcc_s" -HOMEPAGE="https://llvm.org/" - -LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" -SLOT="0" -IUSE="debug test" - -DEPEND=" - ~llvm-runtimes/libunwind-${PV}[static-libs] -" -RDEPEND=" - ${DEPEND} - !sys-devel/gcc -" -BDEPEND=" - llvm-core/clang:${LLVM_MAJOR} - test? ( - $(python_gen_any_dep ">=dev-python/lit-15[\${PYTHON_USEDEP}]") - =llvm-core/clang-${LLVM_VERSION}*:${LLVM_MAJOR} - ) - !test? ( - ${PYTHON_DEPS} - ) -" - -LLVM_COMPONENTS=( compiler-rt cmake llvm/cmake llvm-libgcc ) -LLVM_TEST_COMPONENTS=( llvm/include/llvm/TargetParser ) -llvm.org_set_globals - -python_check_deps() { - use test || return 0 - python_has_version ">=dev-python/lit-15[${PYTHON_USEDEP}]" -} - -pkg_setup() { - 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 - # overrides host docs otherwise - DOCS=() - fi - python-any-r1_pkg_setup -} - -src_configure() { - # We need to build a separate copy of compiler-rt, because we need to disable the - # COMPILER_RT_BUILTINS_HIDE_SYMBOLS option - compatibility with libgcc requires - # visibility of all symbols. - - llvm_prepend_path "${LLVM_MAJOR}" - - # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844 - use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG" - - export CC=${CTARGET}-clang CXX=${CTARGET}-clang++ - strip-unsupported-flags - - local mycmakeargs=( - -DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${LLVM_MAJOR}" - - -DCOMPILER_RT_INCLUDE_TESTS=$(usex test) - -DCOMPILER_RT_BUILD_CRT=OFF - -DCOMPILER_RT_BUILD_CTX_PROFILE=OFF - -DCOMPILER_RT_BUILD_LIBFUZZER=OFF - -DCOMPILER_RT_BUILD_MEMPROF=OFF - -DCOMPILER_RT_BUILD_ORC=OFF - -DCOMPILER_RT_BUILD_PROFILE=OFF - -DCOMPILER_RT_BUILD_SANITIZERS=OFF - -DCOMPILER_RT_BUILD_XRAY=OFF - - -DCOMPILER_RT_BUILTINS_HIDE_SYMBOLS=OFF - - -DPython3_EXECUTABLE="${PYTHON}" - ) - - # disable building non-native runtimes since we don't do multilib - if use amd64; then - mycmakeargs+=( - -DCAN_TARGET_i386=OFF - ) - fi - - if use test; then - mycmakeargs+=( - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" - -DLLVM_LIT_ARGS="$(get_lit_flags)" - - -DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang" - -DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang++" - ) - fi - - cmake_src_configure -} - -# Usage: deps -gen_ldscript() { - local output_format - output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p') - [[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )" - - cat <<-END_LDSCRIPT -/* GNU ld script - Include missing dependencies -*/ -${output_format} -GROUP ( $@ ) -END_LDSCRIPT -} - -src_compile() { - cmake_src_compile - - local rtlib=$( - "${CC}" -rtlib=compiler-rt -resource-dir="${BUILD_DIR}" \ - -print-libgcc-file-name || die - ) - - # Use the llvm-libgcc's version script to produce libgcc.{a,so}, which - # combines compiler-rt and libunwind into a libgcc replacement. - # - # What we do here is similar to what upstream does[0], with the following - # differences: - # - # * We build the local copy of compiler-rt manually, to have a full control - # over CMake options. - # * Upstream links the locally built copy of libunwind statically. We link the - # system-wide libunwind dynamically. - # - # [0] https://github.com/llvm/llvm-project/blob/llvmorg-19.1.7/llvm-libgcc/CMakeLists.txt#L102-L120 - "${CC}" -E -xc \ - "${WORKDIR}/llvm-libgcc/gcc_s.ver.in" \ - -o gcc_s.ver || die - "${CC}" -nostdlib \ - ${LDFLAGS} \ - -Wl,--version-script,gcc_s.ver \ - -Wl,--undefined-version \ - -Wl,--whole-archive \ - "${rtlib}" \ - -Wl,-soname,libgcc_s.so.1.0 \ - -lc -lunwind -shared \ - -o libgcc_s.so.1.0 || die - # Generate libgcc_s.so ldscript for inclusion of libunwind as a - # dependency so that `clang -lgcc_s` works out of the box. - gen_ldscript libgcc_s.so.1.0 libunwind.so.1.0 > libgcc_s.so || die - cp "${rtlib}" libgcc.a || die -} - -src_test() { - # respect TMPDIR! - local -x LIT_PRESERVES_TMP=1 - - cmake_build check-builtins -} - -src_install() { - local libdir=$(get_libdir) - dolib.so libgcc_s.so.1.0 libgcc_s.so - dolib.a libgcc.a - dosym libgcc_s.so.1.0 "/usr/${libdir}/libgcc_s.so.1" - dosym libunwind.a "/usr/${libdir}/libgcc_eh.a" -} diff --git a/llvm-runtimes/libgcc/libgcc-21.0.0_pre20250517.ebuild b/llvm-runtimes/libgcc/libgcc-21.0.0_pre20250517.ebuild deleted file mode 100644 index 2c2ae9d40376..000000000000 --- a/llvm-runtimes/libgcc/libgcc-21.0.0_pre20250517.ebuild +++ /dev/null @@ -1,172 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..13} ) - -inherit cmake crossdev flag-o-matic llvm.org llvm-utils python-any-r1 -inherit toolchain-funcs - -DESCRIPTION="Compiler runtime library for clang, compatible with libgcc_s" -HOMEPAGE="https://llvm.org/" - -LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" -SLOT="0" -IUSE="debug test" - -DEPEND=" - ~llvm-runtimes/libunwind-${PV}[static-libs] -" -RDEPEND=" - ${DEPEND} - !sys-devel/gcc -" -BDEPEND=" - llvm-core/clang:${LLVM_MAJOR} - test? ( - $(python_gen_any_dep ">=dev-python/lit-15[\${PYTHON_USEDEP}]") - =llvm-core/clang-${LLVM_VERSION}*:${LLVM_MAJOR} - ) - !test? ( - ${PYTHON_DEPS} - ) -" - -LLVM_COMPONENTS=( compiler-rt cmake llvm/cmake llvm-libgcc ) -LLVM_TEST_COMPONENTS=( llvm/include/llvm/TargetParser ) -llvm.org_set_globals - -python_check_deps() { - use test || return 0 - python_has_version ">=dev-python/lit-15[${PYTHON_USEDEP}]" -} - -pkg_setup() { - 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 - # overrides host docs otherwise - DOCS=() - fi - python-any-r1_pkg_setup -} - -src_configure() { - # We need to build a separate copy of compiler-rt, because we need to disable the - # COMPILER_RT_BUILTINS_HIDE_SYMBOLS option - compatibility with libgcc requires - # visibility of all symbols. - - llvm_prepend_path "${LLVM_MAJOR}" - - # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844 - use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG" - - export CC=${CTARGET}-clang CXX=${CTARGET}-clang++ - strip-unsupported-flags - - local mycmakeargs=( - -DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${LLVM_MAJOR}" - - -DCOMPILER_RT_INCLUDE_TESTS=$(usex test) - -DCOMPILER_RT_BUILD_CRT=OFF - -DCOMPILER_RT_BUILD_CTX_PROFILE=OFF - -DCOMPILER_RT_BUILD_LIBFUZZER=OFF - -DCOMPILER_RT_BUILD_MEMPROF=OFF - -DCOMPILER_RT_BUILD_ORC=OFF - -DCOMPILER_RT_BUILD_PROFILE=OFF - -DCOMPILER_RT_BUILD_SANITIZERS=OFF - -DCOMPILER_RT_BUILD_XRAY=OFF - - -DCOMPILER_RT_BUILTINS_HIDE_SYMBOLS=OFF - - -DPython3_EXECUTABLE="${PYTHON}" - ) - - # disable building non-native runtimes since we don't do multilib - if use amd64; then - mycmakeargs+=( - -DCAN_TARGET_i386=OFF - ) - fi - - if use test; then - mycmakeargs+=( - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" - -DLLVM_LIT_ARGS="$(get_lit_flags)" - - -DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang" - -DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang++" - ) - fi - - cmake_src_configure -} - -# Usage: deps -gen_ldscript() { - local output_format - output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p') - [[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )" - - cat <<-END_LDSCRIPT -/* GNU ld script - Include missing dependencies -*/ -${output_format} -GROUP ( $@ ) -END_LDSCRIPT -} - -src_compile() { - cmake_src_compile - - local rtlib=$( - "${CC}" -rtlib=compiler-rt -resource-dir="${BUILD_DIR}" \ - -print-libgcc-file-name || die - ) - - # Use the llvm-libgcc's version script to produce libgcc.{a,so}, which - # combines compiler-rt and libunwind into a libgcc replacement. - # - # What we do here is similar to what upstream does[0], with the following - # differences: - # - # * We build the local copy of compiler-rt manually, to have a full control - # over CMake options. - # * Upstream links the locally built copy of libunwind statically. We link the - # system-wide libunwind dynamically. - # - # [0] https://github.com/llvm/llvm-project/blob/llvmorg-19.1.7/llvm-libgcc/CMakeLists.txt#L102-L120 - "${CC}" -E -xc \ - "${WORKDIR}/llvm-libgcc/gcc_s.ver.in" \ - -o gcc_s.ver || die - "${CC}" -nostdlib \ - ${LDFLAGS} \ - -Wl,--version-script,gcc_s.ver \ - -Wl,--undefined-version \ - -Wl,--whole-archive \ - "${rtlib}" \ - -Wl,-soname,libgcc_s.so.1.0 \ - -lc -lunwind -shared \ - -o libgcc_s.so.1.0 || die - # Generate libgcc_s.so ldscript for inclusion of libunwind as a - # dependency so that `clang -lgcc_s` works out of the box. - gen_ldscript libgcc_s.so.1.0 libunwind.so.1.0 > libgcc_s.so || die - cp "${rtlib}" libgcc.a || die -} - -src_test() { - # respect TMPDIR! - local -x LIT_PRESERVES_TMP=1 - - cmake_build check-builtins -} - -src_install() { - local libdir=$(get_libdir) - dolib.so libgcc_s.so.1.0 libgcc_s.so - dolib.a libgcc.a - dosym libgcc_s.so.1.0 "/usr/${libdir}/libgcc_s.so.1" - dosym libunwind.a "/usr/${libdir}/libgcc_eh.a" -}