summaryrefslogtreecommitdiff
path: root/sys-devel/mold
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2024-05-01 00:00:05 +0100
committerV3n3RiX <venerix@koprulu.sector>2024-05-01 00:00:05 +0100
commit3d12b65aa1b4bb8b02b1f8d3e77bccf230b79a09 (patch)
treecb6347688c91bfbdebe49a78a55dad3d72cc193e /sys-devel/mold
parent4c2b70adc6484c35ff05e412de08a7b7f50cfb34 (diff)
gentoo auto-resync : 01:05:2024 - 00:00:04
Diffstat (limited to 'sys-devel/mold')
-rw-r--r--sys-devel/mold/Manifest10
-rw-r--r--sys-devel/mold/files/mold-2.30.0-gcc14.patch76
-rw-r--r--sys-devel/mold/files/mold-2.30.0-which-hunt.patch31
-rw-r--r--sys-devel/mold/mold-2.30.0.ebuild6
-rw-r--r--sys-devel/mold/mold-2.4.0.ebuild3
-rw-r--r--sys-devel/mold/mold-2.4.1.ebuild1
-rw-r--r--sys-devel/mold/mold-9999.ebuild1
7 files changed, 119 insertions, 9 deletions
diff --git a/sys-devel/mold/Manifest b/sys-devel/mold/Manifest
index 2075fbe10ecd..03b991eb49f7 100644
--- a/sys-devel/mold/Manifest
+++ b/sys-devel/mold/Manifest
@@ -1,11 +1,13 @@
AUX mold-2.3.0-no-pch.patch 457 BLAKE2B ac313a6409a2e43b6d26833231cb26c36d3d34f25b25d4217d50fbd1f39eda9d5b42a1939ca8ee48f6dfb73d3c27d7c6111da9beb67a43c72d3c2beb070303b0 SHA512 c79b3e998cbc23ca7069eed95a7d7871371da9c21b6970fe2a1d8dcd1009466e262f63febbc267d364e552b2eb4bebd5d74bc6dc8084d48d4c0e9e02e1d868bc
+AUX mold-2.30.0-gcc14.patch 2419 BLAKE2B 91906617dc78f620c34a31381d74bf11551dbe8963c7ac0447acc56314026342b0583441aa1857de5f6fb2255589bb79f76451d72a8a385366ece2b2a89e8960 SHA512 2e2bf547caeddb5c4970bb8f3555e104a16b499017832df86535cfeebb2ca5178fa7ed36c7e27e64a3822aab7985266ef62143668c241a632183ba4a06a19259
+AUX mold-2.30.0-which-hunt.patch 985 BLAKE2B 89d1d0ca075b1199911e63cbe87b53066557984d2ef97df89578accda4f7ca10ab279f920cce64eb1329029421750b8aa27bd482f2e6ae3655937200445ed83a SHA512 bd1ca6aba29e1cf96706153544f350a948e08e81645c2d4fb657ed8e8775b239f09f7469f2e5e8d0e6e5dde8cc6c97b938fa4441139d6c8bf5c93923db77974c
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.4.0.tar.gz 9974233 BLAKE2B 0710d9ce0407b64b05a23e04db142d603b38d41cd9e5e322b650680ee2bd8684f57647e9a0b5efc23b2106eb1e38e38143be7d4b357b2d32e4fe0b6a99e41cca SHA512 e332d027f783dfb0a4f48b1fb7daf98e11e830f8de82b971b58ee8a7bae59eaa30b8155e7491b6057f0ce8e0b09ddd0ab1d364f01ea15517e1d089fdb292a4e5
DIST mold-2.4.1.tar.gz 9957259 BLAKE2B 17aab84c0793dc305d53a3c2f372ddc92395b6941ffe372af55cf94f4dd65ea8d63d4e85dcdb3e76622811e5f95577d6f10612102c373835d6f75f2a3d0bcfed SHA512 d61ee4306ecaa6ba5b4ce120636e70db081bb824a482bb3014429e13294134bc2560b1a9b477c47378f1062107f1c32dba2810e41be199cd6882cd1146971245
EBUILD mold-2.1.0.ebuild 2169 BLAKE2B b91dec8fb9890052e06cf40124f7647833a6ea786d95d44863848bfff17c0ba335f28aaac08d6971a619dbb845b9091d1134bae47f70bd811d2fde0f9ca11066 SHA512 5d27926e5003e6bd24ee3baf8258ab043aa660b7a36918500283bbec9d991ad8ea6971add52579ba6ee10a7eeeb97a6dff3a7e065c7292ced42d2f0043e33d1e
-EBUILD mold-2.30.0.ebuild 2406 BLAKE2B 38c670ba2278dc84ed5abb390f247fa2f4c241e67c1f8e3a9a701e12ad426e6f553fc6aa96f7ef328698949df57823fbc9a40720ed83ad4b83b8019a32fde88a SHA512 f3a73a7739298f9b9f667b225774d14f02adac72d8e5dc5884907ef2ccd7e1eec3a9bc80cfa5ba70b14f976ac55dac400cc456e125d6b2eb1bf362ca8a4b9def
-EBUILD mold-2.4.0.ebuild 2459 BLAKE2B 012e8034f5f9ebd72a40897e954684ee9721250c4d37735067154a2011b6344feb0da718e8106d8f7da86e0b23d16f4d952e756d92afa44781712fceae59aef3 SHA512 97c8fb81cadf290d9ccfa687cb58883288cc18241b714ba47cf54512cf36863794204d41fd49019098ff0e327541fcd4a861d8af557fbace8eb942dfebe9d6f4
-EBUILD mold-2.4.1.ebuild 2407 BLAKE2B 46d18f13582e6271a0fc9cb0c546a9aaf2efaf021420283b99a899fbd239a6c24ccb5c88e1b020a0010c7055c1d9ab6ddfdb995f83736a5496ee0febe5db344e SHA512 5027569ac8b11e7df4dd08f546292cd364676cda05d6ec594f3b768148d7e26f51b796aa17bbb222b82be4263d80afef0491d6281430cc458cd7cfa02e818550
-EBUILD mold-9999.ebuild 2407 BLAKE2B 46d18f13582e6271a0fc9cb0c546a9aaf2efaf021420283b99a899fbd239a6c24ccb5c88e1b020a0010c7055c1d9ab6ddfdb995f83736a5496ee0febe5db344e SHA512 5027569ac8b11e7df4dd08f546292cd364676cda05d6ec594f3b768148d7e26f51b796aa17bbb222b82be4263d80afef0491d6281430cc458cd7cfa02e818550
+EBUILD mold-2.30.0.ebuild 2456 BLAKE2B f91748ee6adfab7956209111c5e26711db20ad701caf255cb54d04eec8e9cc862f86e43ceb79d90cefac1e427aba479f0c84a590e4d38d16442fb3bd5f5c1538 SHA512 cc2f642d0eb97d2dc35cb25d3649f74ad008dcbc40e37c140e932b20074f156e7e36f1be81c83855372fbcb779f99646a634094fc6265be8fdb0ef42d6a3d4b7
+EBUILD mold-2.4.0.ebuild 2419 BLAKE2B 5aae5dce0f49f7982b0367cc3d0edce8bd5afa9354d69e606cae21a665e10bee32b55071cf50ac6bc1b9f7840e885b2792383674ef546b904a0ed7369368f2d4 SHA512 f5ad699310e9a53a048850c6fdc429d17fc952045c089f1b297cd0581e0e870a94c386ef0d17580dbc36ed504f64253646d12233e4e17568cd9301db90336b5d
+EBUILD mold-2.4.1.ebuild 2367 BLAKE2B 64476998c316857a9b39c6ffb2d7b01a7f49063aef49e9ac0227c773775e70817efdbb07b00e465f92120af627e9201a5df65761a532258f91ff7d64077eabbe SHA512 b8d94bae9cfb163d8674524e14a854b69d4c060c2404a4848857f47b1147b6fc3a9659b9ae57bb5cfb4bc9b4f3a726b287b2256c99a895438bd1fb5fe32e13ca
+EBUILD mold-9999.ebuild 2367 BLAKE2B 64476998c316857a9b39c6ffb2d7b01a7f49063aef49e9ac0227c773775e70817efdbb07b00e465f92120af627e9201a5df65761a532258f91ff7d64077eabbe SHA512 b8d94bae9cfb163d8674524e14a854b69d4c060c2404a4848857f47b1147b6fc3a9659b9ae57bb5cfb4bc9b4f3a726b287b2256c99a895438bd1fb5fe32e13ca
MISC metadata.xml 424 BLAKE2B a1c0cbdcb86c323fa1e6143c9665ec548f7713e74002a25b2fc26c51b60dae00922d3448a5aaecd5027a8cb026a681386ca7dea90657a3e10b25fb194dafc0d3 SHA512 1adc934e78ca0210743a1aa7479ebc4b5ea0b66a348c4408423460f02b404b885d3a8eca6e89ea8ac53ac9c76e85116965f1eef79e3f3e1f0451c8cf5ce0dfd6
diff --git a/sys-devel/mold/files/mold-2.30.0-gcc14.patch b/sys-devel/mold/files/mold-2.30.0-gcc14.patch
new file mode 100644
index 000000000000..74e7f5081eeb
--- /dev/null
+++ b/sys-devel/mold/files/mold-2.30.0-gcc14.patch
@@ -0,0 +1,76 @@
+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 <ruiu@cs.stanford.edu>
+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 <ruiu@cs.stanford.edu>
+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
new file mode 100644
index 000000000000..d8558091c4bc
--- /dev/null
+++ b/sys-devel/mold/files/mold-2.30.0-which-hunt.patch
@@ -0,0 +1,31 @@
+https://github.com/rui314/mold/pull/1246
+
+From ec0a9d09ddff8b1796ff1822d5381442cd28acb1 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+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 <sam@gentoo.org>
+---
+ 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
index a121f5ffefba..05ff0820df78 100644
--- a/sys-devel/mold/mold-2.30.0.ebuild
+++ b/sys-devel/mold/mold-2.30.0.ebuild
@@ -31,6 +31,11 @@ RDEPEND="
"
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
@@ -65,7 +70,6 @@ src_prepare() {
src_configure() {
local mycmakeargs=(
- -DCMAKE_DISABLE_PRECOMPILE_HEADERS=ON
-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)
diff --git a/sys-devel/mold/mold-2.4.0.ebuild b/sys-devel/mold/mold-2.4.0.ebuild
index 52d41ed470e9..39999e0ec4a8 100644
--- a/sys-devel/mold/mold-2.4.0.ebuild
+++ b/sys-devel/mold/mold-2.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 Gentoo Authors
+# Copyright 2021-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -69,7 +69,6 @@ src_prepare() {
src_configure() {
local mycmakeargs=(
- -DCMAKE_DISABLE_PRECOMPILE_HEADERS=ON
-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)
diff --git a/sys-devel/mold/mold-2.4.1.ebuild b/sys-devel/mold/mold-2.4.1.ebuild
index ac067b811ef2..066b8e9902c7 100644
--- a/sys-devel/mold/mold-2.4.1.ebuild
+++ b/sys-devel/mold/mold-2.4.1.ebuild
@@ -65,7 +65,6 @@ src_prepare() {
src_configure() {
local mycmakeargs=(
- -DCMAKE_DISABLE_PRECOMPILE_HEADERS=ON
-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)
diff --git a/sys-devel/mold/mold-9999.ebuild b/sys-devel/mold/mold-9999.ebuild
index ac067b811ef2..066b8e9902c7 100644
--- a/sys-devel/mold/mold-9999.ebuild
+++ b/sys-devel/mold/mold-9999.ebuild
@@ -65,7 +65,6 @@ src_prepare() {
src_configure() {
local mycmakeargs=(
- -DCMAKE_DISABLE_PRECOMPILE_HEADERS=ON
-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)