commit: a6ddeed354bf19b4e36d53b4ea268c9989aa66ea Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Mon Sep 2 05:13:09 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Sep 2 05:13:09 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6ddeed3
sys-devel/mold: drop 2.30.0, 2.31.0, 2.32.0 Signed-off-by: Sam James <sam <AT> gentoo.org> sys-devel/mold/Manifest | 3 - sys-devel/mold/files/mold-2.30.0-gcc14.patch | 76 ---------------- sys-devel/mold/files/mold-2.30.0-which-hunt.patch | 31 ------- sys-devel/mold/mold-2.30.0.ebuild | 103 ---------------------- sys-devel/mold/mold-2.31.0.ebuild | 98 -------------------- sys-devel/mold/mold-2.32.0.ebuild | 99 --------------------- 6 files changed, 410 deletions(-) diff --git a/sys-devel/mold/Manifest b/sys-devel/mold/Manifest index 998c10749466..7ed9976e301e 100644 --- a/sys-devel/mold/Manifest +++ b/sys-devel/mold/Manifest @@ -1,6 +1,3 @@ DIST mold-2.1.0.tar.gz 9278811 BLAKE2B b31e13f92177553adf5069cf35c8c75c7bc28f0af4d1726cdc0c6abc1c9d3baaa5be512c3a8fb9bc3c3110096a79e1c6751c701171769595a2234fc1fa8c441a SHA512 f1c98d349b35b4042109d71f7db6eb8d7d089dc3241735bbd7b5402d513dcc85ca17904828779e5fc8234650fa9fb97f47c3a2f3e89cc2fb3cb9e9110439e5a2 -DIST mold-2.30.0.tar.gz 9957539 BLAKE2B f45924598029dabfb2c02298e1f89aae848cd64e2e87dd80f500de323517db92e62df798feee8a2cd81cb930eff0640c2b9957808a4080f0027884015994ce64 SHA512 7cfba4f0fb332799ad267d3eafb8e2f0057af4484467b3e3fbaf8044220163a2c7e26cd1786510f250844c8b57e30c15167c8dd9688af1773abc580c5605abf3 -DIST mold-2.31.0.tar.gz 10031469 BLAKE2B 338f516efcb430c8393fb0d6861b913fa1dd0095226e3d13018255da4f0b4affa168928b1e5cfbd0b5a4efcf840612675f04579f0c1d3c0e2b3c6815d6bef4c0 SHA512 343c62d8c67b74988f762c46999d2d866b2e9a0c69d2b910b12384ea5abc620b30468cd1b1bacfe41474d1c97c8ce2e49d55ca70479691238fb73d83d9adc683 -DIST mold-2.32.0.tar.gz 10005686 BLAKE2B a277a29498f4d6b33da49ba038ce5ef1c4a1bd3ac84ea994a2aae5d36139a2ee773e08e1a3ff0a7382da4d2319ce994575e3ed1e5be8e5f7a161045aaf4e2d58 SHA512 66cd95ec65b31749ead7604f921eebd9f8e7faad82f6aa2cd7a179e4f4cb2bd78584ec5a8de000fbd4c37bbbfeb878e40a4e93ca909d1be557d73117e4b38f4b DIST mold-2.32.1.tar.gz 10010384 BLAKE2B b020d57df25d91fac9b6ef994e9f7f73b6736d18a73be3caebe03a851a1db1986abe395b5481a1e30e01f38362c3705cb5903251b7201c0003c745dee37a5148 SHA512 d38b12faf81ba8015fc0cdb52944ac94366877c3033871a92610087e036d75b3d072baf9bbf107a9029495521e067fb36c0809b5138f90976492547b39c33085 DIST mold-2.33.0.tar.gz 10061838 BLAKE2B 65c460035f3bdbc101120a27e30b70982d549a4222cf4beb1b7228c0c961afd3eb8928cacde5be20734a80a80765eb60e6d961bd5cb001ecaef1aba1152730b9 SHA512 67c41ae33f8a229f32aabf32ffb8bcb261eff047dedd189b8751e5de43ef12a2dbd05f45632c8baeac2ceff99c40256256d7d5c790cc12e4fecf1dc3cfebeb11 diff --git a/sys-devel/mold/files/mold-2.30.0-gcc14.patch b/sys-devel/mold/files/mold-2.30.0-gcc14.patch deleted file mode 100644 index 74e7f5081eeb..000000000000 --- a/sys-devel/mold/files/mold-2.30.0-gcc14.patch +++ /dev/null @@ -1,76 +0,0 @@ -https://github.com/rui314/mold/issues/1244 -https://github.com/rui314/mold/commit/002d619b11f38438514f4714f9eb89e8015ba1b6 -https://github.com/rui314/mold/commit/14952546a489c23236f50adc5ef9c8ada4f4e31a - -From 002d619b11f38438514f4714f9eb89e8015ba1b6 Mon Sep 17 00:00:00 2001 -From: Rui Ueyama <[email protected]> -Date: Thu, 25 Apr 2024 16:58:09 +0900 -Subject: [PATCH] Attempt to fix a test failure - -I believe some version of objcopy corrupts an object file when -renaming a section. In this change, I use sed instead of objcopy -as a workaround. - -Fixes https://github.com/rui314/mold/issues/1244 ---- - test/elf/exception-multiple-ehframe.sh | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/test/elf/exception-multiple-ehframe.sh b/test/elf/exception-multiple-ehframe.sh -index ca1d1a1c0..a9b360b09 100755 ---- a/test/elf/exception-multiple-ehframe.sh -+++ b/test/elf/exception-multiple-ehframe.sh -@@ -28,9 +28,9 @@ int bar() { - } - EOF - --$OBJCOPY --rename-section .eh_frame=.eh_frame2 $t/a.o -+sed -i 's/\.eh_frame/.EH_FRAME/g' $t/a.o - ./mold -r -o $t/c.o $t/a.o $t/b.o --$OBJCOPY --rename-section .eh_frame2=.eh_frame $t/c.o -+sed -i 's/\.EH_FRAME/.eh_frame/g' $t/c.o - - cat <<EOF | $CXX -o $t/d.o -c -xc++ - - #include <stdio.h> -@@ -44,5 +44,4 @@ int main() { - EOF - - $CXX -B. -o $t/exe1 $t/d.o $t/c.o --$QEMU $t/exe1 - $QEMU $t/exe1 | grep -q '^1 3$' - -From 14952546a489c23236f50adc5ef9c8ada4f4e31a Mon Sep 17 00:00:00 2001 -From: Rui Ueyama <[email protected]> -Date: Sun, 28 Apr 2024 13:04:43 +0900 -Subject: [PATCH] Do not edit binary files with sed - -Fixes https://github.com/rui314/mold/issues/1244 ---- - test/elf/exception-multiple-ehframe.sh | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/test/elf/exception-multiple-ehframe.sh b/test/elf/exception-multiple-ehframe.sh -index a9b360b09..8cc31624a 100755 ---- a/test/elf/exception-multiple-ehframe.sh -+++ b/test/elf/exception-multiple-ehframe.sh -@@ -3,6 +3,8 @@ - - nm mold | grep -q '__tsan_init' && skip - -+which perl > /dev/null || skip -+ - [ $MACHINE = m68k ] && skip - [ $MACHINE = sh4 ] && skip - -@@ -28,9 +30,9 @@ int bar() { - } - EOF - --sed -i 's/\.eh_frame/.EH_FRAME/g' $t/a.o -+perl -i -0777 -pe 's/\.eh_frame/.EH_FRAME/g' $t/a.o - ./mold -r -o $t/c.o $t/a.o $t/b.o --sed -i 's/\.EH_FRAME/.eh_frame/g' $t/c.o -+perl -i -0777 -pe 's/\.EH_FRAME/.eh_frame/g' $t/c.o - - cat <<EOF | $CXX -o $t/d.o -c -xc++ - - #include <stdio.h> diff --git a/sys-devel/mold/files/mold-2.30.0-which-hunt.patch b/sys-devel/mold/files/mold-2.30.0-which-hunt.patch deleted file mode 100644 index d8558091c4bc..000000000000 --- a/sys-devel/mold/files/mold-2.30.0-which-hunt.patch +++ /dev/null @@ -1,31 +0,0 @@ -https://github.com/rui314/mold/pull/1246 - -From ec0a9d09ddff8b1796ff1822d5381442cd28acb1 Mon Sep 17 00:00:00 2001 -From: Sam James <[email protected]> -Date: Tue, 30 Apr 2024 07:54:40 +0100 -Subject: [PATCH] test: use `command -v`, not non-portable `which` - -`which` isn't in POSIX and several Linux distributions are trying to -remove it from their base system, see e.g. https://lwn.net/Articles/874049/. - -Just use `command -v` which is POSIX. - -Signed-off-by: Sam James <[email protected]> ---- - test/elf/exception-multiple-ehframe.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/test/elf/exception-multiple-ehframe.sh b/test/elf/exception-multiple-ehframe.sh -index 8cc31624a..1b9f434a4 100755 ---- a/test/elf/exception-multiple-ehframe.sh -+++ b/test/elf/exception-multiple-ehframe.sh -@@ -3,7 +3,7 @@ - - nm mold | grep -q '__tsan_init' && skip - --which perl > /dev/null || skip -+command -v perl > /dev/null || skip - - [ $MACHINE = m68k ] && skip - [ $MACHINE = sh4 ] && skip - diff --git a/sys-devel/mold/mold-2.30.0.ebuild b/sys-devel/mold/mold-2.30.0.ebuild deleted file mode 100644 index 05ff0820df78..000000000000 --- a/sys-devel/mold/mold-2.30.0.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 2021-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake toolchain-funcs - -DESCRIPTION="A Modern Linker" -HOMEPAGE="https://github.com/rui314/mold"; -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://github.com/rui314/mold.git"; - inherit git-r3 -else - SRC_URI="https://github.com/rui314/mold/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv ~sparc ~x86" -fi - -# mold (MIT) -# - xxhash (BSD-2) -LICENSE="MIT BSD-2" -SLOT="0" - -RDEPEND=" - app-arch/zstd:= - >=dev-cpp/tbb-2021.7.0-r1:= - dev-libs/blake3:= - sys-libs/zlib - !kernel_Darwin? ( - >=dev-libs/mimalloc-2:= - ) -" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/${P}-gcc14.patch - "${FILESDIR}"/${PN}-2.30.0-which-hunt.patch -) - -pkg_pretend() { - # Requires a c++20 compiler, see #831473 - if [[ ${MERGE_TYPE} != binary ]]; then - if tc-is-gcc && [[ $(gcc-major-version) -lt 10 ]]; then - die "${PN} needs at least gcc 10" - elif tc-is-clang && [[ $(clang-major-version) -lt 12 ]]; then - die "${PN} needs at least clang 12" - fi - fi -} - -src_prepare() { - cmake_src_prepare - - # Needs unpackaged dwarfdump - rm test/elf/{{dead,compress}-debug-sections,compressed-debug-info}.sh || die - - # Heavy tests, need qemu - rm test/elf/gdb-index-{compress-output,dwarf{2,3,4,5}}.sh || die - rm test/elf/lto-{archive,dso,gcc,llvm,version-script}.sh || die - - # Sandbox sadness - rm test/elf/run.sh || die - sed -i 's|`pwd`/mold-wrapper.so|"& ${LD_PRELOAD}"|' \ - test/elf/mold-wrapper{,2}.sh || die - - # static-pie tests require glibc built with static-pie support - if ! has_version -d 'sys-libs/glibc[static-pie(+)]'; then - rm test/elf/{,ifunc-}static-pie.sh || die - fi -} - -src_configure() { - local mycmakeargs=( - -DMOLD_ENABLE_QEMU_TESTS=OFF - -DMOLD_LTO=OFF # Should be up to the user to decide this with CXXFLAGS. - -DMOLD_USE_MIMALLOC=$(usex !kernel_Darwin) - -DMOLD_USE_SYSTEM_MIMALLOC=ON - -DMOLD_USE_SYSTEM_TBB=ON - ) - cmake_src_configure -} - -src_install() { - dobin "${BUILD_DIR}"/${PN} - - # https://bugs.gentoo.org/872773 - insinto /usr/$(get_libdir)/mold - doins "${BUILD_DIR}"/${PN}-wrapper.so - - dodoc docs/{design,execstack}.md - doman docs/${PN}.1 - - dosym ${PN} /usr/bin/ld.${PN} - dosym ${PN} /usr/bin/ld64.${PN} - dosym -r /usr/bin/${PN} /usr/libexec/${PN}/ld -} - -src_test() { - export TEST_CC="$(tc-getCC)" \ - TEST_GCC="$(tc-getCC)" \ - TEST_CXX="$(tc-getCXX)" \ - TEST_GXX="$(tc-getCXX)" - cmake_src_test -} diff --git a/sys-devel/mold/mold-2.31.0.ebuild b/sys-devel/mold/mold-2.31.0.ebuild deleted file mode 100644 index 7b109302a083..000000000000 --- a/sys-devel/mold/mold-2.31.0.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 2021-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake toolchain-funcs - -DESCRIPTION="A Modern Linker" -HOMEPAGE="https://github.com/rui314/mold"; -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://github.com/rui314/mold.git"; - inherit git-r3 -else - SRC_URI="https://github.com/rui314/mold/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv ~sparc ~x86" -fi - -# mold (MIT) -# - xxhash (BSD-2) -LICENSE="MIT BSD-2" -SLOT="0" - -RDEPEND=" - app-arch/zstd:= - >=dev-cpp/tbb-2021.7.0-r1:= - dev-libs/blake3:= - sys-libs/zlib - !kernel_Darwin? ( - >=dev-libs/mimalloc-2:= - ) -" -DEPEND="${RDEPEND}" - -pkg_pretend() { - # Requires a c++20 compiler, see #831473 - if [[ ${MERGE_TYPE} != binary ]]; then - if tc-is-gcc && [[ $(gcc-major-version) -lt 10 ]]; then - die "${PN} needs at least gcc 10" - elif tc-is-clang && [[ $(clang-major-version) -lt 12 ]]; then - die "${PN} needs at least clang 12" - fi - fi -} - -src_prepare() { - cmake_src_prepare - - # Needs unpackaged dwarfdump - rm test/elf/{{dead,compress}-debug-sections,compressed-debug-info}.sh || die - - # Heavy tests, need qemu - rm test/elf/gdb-index-{compress-output,dwarf{2,3,4,5}}.sh || die - rm test/elf/lto-{archive,dso,gcc,llvm,version-script}.sh || die - - # Sandbox sadness - rm test/elf/run.sh || die - sed -i 's|`pwd`/mold-wrapper.so|"& ${LD_PRELOAD}"|' \ - test/elf/mold-wrapper{,2}.sh || die - - # static-pie tests require glibc built with static-pie support - if ! has_version -d 'sys-libs/glibc[static-pie(+)]'; then - rm test/elf/{,ifunc-}static-pie.sh || die - fi -} - -src_configure() { - local mycmakeargs=( - -DMOLD_ENABLE_QEMU_TESTS=OFF - -DMOLD_LTO=OFF # Should be up to the user to decide this with CXXFLAGS. - -DMOLD_USE_MIMALLOC=$(usex !kernel_Darwin) - -DMOLD_USE_SYSTEM_MIMALLOC=ON - -DMOLD_USE_SYSTEM_TBB=ON - ) - cmake_src_configure -} - -src_install() { - dobin "${BUILD_DIR}"/${PN} - - # https://bugs.gentoo.org/872773 - insinto /usr/$(get_libdir)/mold - doins "${BUILD_DIR}"/${PN}-wrapper.so - - dodoc docs/{design,execstack}.md - doman docs/${PN}.1 - - dosym ${PN} /usr/bin/ld.${PN} - dosym ${PN} /usr/bin/ld64.${PN} - dosym -r /usr/bin/${PN} /usr/libexec/${PN}/ld -} - -src_test() { - export TEST_CC="$(tc-getCC)" \ - TEST_GCC="$(tc-getCC)" \ - TEST_CXX="$(tc-getCXX)" \ - TEST_GXX="$(tc-getCXX)" - cmake_src_test -} diff --git a/sys-devel/mold/mold-2.32.0.ebuild b/sys-devel/mold/mold-2.32.0.ebuild deleted file mode 100644 index 638c34d50c92..000000000000 --- a/sys-devel/mold/mold-2.32.0.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 2021-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake toolchain-funcs - -DESCRIPTION="A Modern Linker" -HOMEPAGE="https://github.com/rui314/mold"; -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://github.com/rui314/mold.git"; - inherit git-r3 -else - SRC_URI="https://github.com/rui314/mold/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~sparc ~x86" -fi - -# mold (MIT) -# - xxhash (BSD-2) -# - siphash ( MIT CC0-1.0 ) -LICENSE="MIT BSD-2 CC0-1.0" -SLOT="0" - -RDEPEND=" - app-arch/zstd:= - >=dev-cpp/tbb-2021.7.0-r1:= - dev-libs/blake3:= - sys-libs/zlib - !kernel_Darwin? ( - >=dev-libs/mimalloc-2:= - ) -" -DEPEND="${RDEPEND}" - -pkg_pretend() { - # Requires a c++20 compiler, see #831473 - if [[ ${MERGE_TYPE} != binary ]]; then - if tc-is-gcc && [[ $(gcc-major-version) -lt 10 ]]; then - die "${PN} needs at least gcc 10" - elif tc-is-clang && [[ $(clang-major-version) -lt 12 ]]; then - die "${PN} needs at least clang 12" - fi - fi -} - -src_prepare() { - cmake_src_prepare - - # Needs unpackaged dwarfdump - rm test/elf/{{dead,compress}-debug-sections,compressed-debug-info}.sh || die - - # Heavy tests, need qemu - rm test/elf/gdb-index-{compress-output,dwarf{2,3,4,5}}.sh || die - rm test/elf/lto-{archive,dso,gcc,llvm,version-script}.sh || die - - # Sandbox sadness - rm test/elf/run.sh || die - sed -i 's|`pwd`/mold-wrapper.so|"& ${LD_PRELOAD}"|' \ - test/elf/mold-wrapper{,2}.sh || die - - # static-pie tests require glibc built with static-pie support - if ! has_version -d 'sys-libs/glibc[static-pie(+)]'; then - rm test/elf/{,ifunc-}static-pie.sh || die - fi -} - -src_configure() { - local mycmakeargs=( - -DMOLD_ENABLE_QEMU_TESTS=OFF - -DMOLD_LTO=OFF # Should be up to the user to decide this with CXXFLAGS. - -DMOLD_USE_MIMALLOC=$(usex !kernel_Darwin) - -DMOLD_USE_SYSTEM_MIMALLOC=ON - -DMOLD_USE_SYSTEM_TBB=ON - ) - cmake_src_configure -} - -src_install() { - dobin "${BUILD_DIR}"/${PN} - - # https://bugs.gentoo.org/872773 - insinto /usr/$(get_libdir)/mold - doins "${BUILD_DIR}"/${PN}-wrapper.so - - dodoc docs/{design,execstack}.md - doman docs/${PN}.1 - - dosym ${PN} /usr/bin/ld.${PN} - dosym ${PN} /usr/bin/ld64.${PN} - dosym -r /usr/bin/${PN} /usr/libexec/${PN}/ld -} - -src_test() { - export TEST_CC="$(tc-getCC)" \ - TEST_GCC="$(tc-getCC)" \ - TEST_CXX="$(tc-getCXX)" \ - TEST_GXX="$(tc-getCXX)" - cmake_src_test -}
