[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2024-05-03 Thread Sam James
commit: f176a8b05952b67fda70982cd81b8a11b3703df1
Author: Sam James  gentoo  org>
AuthorDate: Fri May  3 06:36:08 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri May  3 06:36:08 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f176a8b0

sys-devel/mold: add 2.31.0

Signed-off-by: Sam James  gentoo.org>

 sys-devel/mold/Manifest   |  1 +
 sys-devel/mold/mold-2.31.0.ebuild | 98 +++
 2 files changed, 99 insertions(+)

diff --git a/sys-devel/mold/Manifest b/sys-devel/mold/Manifest
index c1d532776618..aeabc142aef5 100644
--- a/sys-devel/mold/Manifest
+++ b/sys-devel/mold/Manifest
@@ -1,4 +1,5 @@
 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.4.0.tar.gz 9974233 BLAKE2B 
0710d9ce0407b64b05a23e04db142d603b38d41cd9e5e322b650680ee2bd8684f57647e9a0b5efc23b2106eb1e38e38143be7d4b357b2d32e4fe0b6a99e41cca
 SHA512 
e332d027f783dfb0a4f48b1fb7daf98e11e830f8de82b971b58ee8a7bae59eaa30b8155e7491b6057f0ce8e0b09ddd0ab1d364f01ea15517e1d089fdb292a4e5
 DIST mold-2.4.1.tar.gz 9957259 BLAKE2B 
17aab84c0793dc305d53a3c2f372ddc92395b6941ffe372af55cf94f4dd65ea8d63d4e85dcdb3e76622811e5f95577d6f10612102c373835d6f75f2a3d0bcfed
 SHA512 
d61ee4306ecaa6ba5b4ce120636e70db081bb824a482bb3014429e13294134bc2560b1a9b477c47378f1062107f1c32dba2810e41be199cd6882cd1146971245

diff --git a/sys-devel/mold/mold-2.31.0.ebuild 
b/sys-devel/mold/mold-2.31.0.ebuild
new file mode 100644
index ..066b8e9902c7
--- /dev/null
+++ b/sys-devel/mold/mold-2.31.0.ebuild
@@ -0,0 +1,98 @@
+# 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} ==  ]] ; 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
+   

[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2024-04-30 Thread Sam James
commit: 76f1e8e99653bc5824e854ebef6a675000eb597a
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 30 07:03:18 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 30 07:03:18 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76f1e8e9

sys-devel/mold: drop obsolete PCH option

No longer needed as the eclass does it for us 
(3867345f8c2d9f24157508bc6372f479a82cf33f).

Signed-off-by: Sam James  gentoo.org>

 sys-devel/mold/mold-2.30.0.ebuild | 1 -
 sys-devel/mold/mold-2.4.0.ebuild  | 3 +--
 sys-devel/mold/mold-2.4.1.ebuild  | 1 -
 sys-devel/mold/mold-.ebuild   | 1 -
 4 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/sys-devel/mold/mold-2.30.0.ebuild 
b/sys-devel/mold/mold-2.30.0.ebuild
index cce55d1650c9..05ff0820df78 100644
--- a/sys-devel/mold/mold-2.30.0.ebuild
+++ b/sys-devel/mold/mold-2.30.0.ebuild
@@ -70,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..3e0ec4a8 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-.ebuild b/sys-devel/mold/mold-.ebuild
index ac067b811ef2..066b8e9902c7 100644
--- a/sys-devel/mold/mold-.ebuild
+++ b/sys-devel/mold/mold-.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)



[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/files/, sys-devel/mold/

2024-04-30 Thread Sam James
commit: 907cb4aa2d36c14e559e2b7a81f1281c8810264f
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 30 07:02:15 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 30 07:02:15 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=907cb4aa

sys-devel/mold: fix tests w/ gcc 14

Test-only change.

Bug: https://github.com/rui314/mold/issues/1244
Signed-off-by: Sam James  gentoo.org>

 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 |  5 ++
 3 files changed, 112 insertions(+)

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 ..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 
+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 <
+@@ -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 
+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 <

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 ..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 
+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 
+---
+ 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..cce55d1650c9 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



[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2024-04-28 Thread Sam James
commit: 2138c0a72b02ad6038a4ce085450d193c79a420a
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr 29 02:46:14 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr 29 02:46:14 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2138c0a7

sys-devel/mold: Stabilize 2.30.0 amd64, #930847

Signed-off-by: Sam James  gentoo.org>

 sys-devel/mold/mold-2.30.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/mold/mold-2.30.0.ebuild 
b/sys-devel/mold/mold-2.30.0.ebuild
index ac067b811ef2..a121f5ffefba 100644
--- a/sys-devel/mold/mold-2.30.0.ebuild
+++ b/sys-devel/mold/mold-2.30.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} ==  ]] ; then
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"
+   KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv ~sparc ~x86"
 fi
 
 # mold (MIT)



[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2024-03-15 Thread Sam James
commit: 541160ea6bbe64890726303e995bfc1f3e14fca9
Author: Sam James  gentoo  org>
AuthorDate: Sat Mar 16 00:19:19 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Mar 16 00:19:33 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=541160ea

sys-devel/mold: add 2.30.0

Signed-off-by: Sam James  gentoo.org>

 sys-devel/mold/Manifest   |  1 +
 sys-devel/mold/mold-2.30.0.ebuild | 99 +++
 2 files changed, 100 insertions(+)

diff --git a/sys-devel/mold/Manifest b/sys-devel/mold/Manifest
index 5e25ce84da6e..c1d532776618 100644
--- a/sys-devel/mold/Manifest
+++ b/sys-devel/mold/Manifest
@@ -1,3 +1,4 @@
 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

diff --git a/sys-devel/mold/mold-2.30.0.ebuild 
b/sys-devel/mold/mold-2.30.0.ebuild
new file mode 100644
index ..ac067b811ef2
--- /dev/null
+++ b/sys-devel/mold/mold-2.30.0.ebuild
@@ -0,0 +1,99 @@
+# 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} ==  ]] ; 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=(
+   -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)
+   -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)" \

[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2024-02-29 Thread Sam James
commit: 9e851e6a890ccd3b6fbc4145cc131bdb543ad41f
Author: Sam James  gentoo  org>
AuthorDate: Fri Mar  1 06:54:56 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Mar  1 07:54:39 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e851e6a

sys-devel/mold: add 2.4.1

Since 3867345f8c2d9f24157508bc6372f479a82cf33f, cmake.eclass should handle
the PCH thing for us, so drop the patch (which needed rebasing anyway).

Signed-off-by: Sam James  gentoo.org>

 sys-devel/mold/Manifest| 1 +
 sys-devel/mold/{mold-.ebuild => mold-2.4.1.ebuild} | 6 +-
 sys-devel/mold/mold-.ebuild| 6 +-
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/sys-devel/mold/Manifest b/sys-devel/mold/Manifest
index 6ffc574ae7e4..5e25ce84da6e 100644
--- a/sys-devel/mold/Manifest
+++ b/sys-devel/mold/Manifest
@@ -1,2 +1,3 @@
 DIST mold-2.1.0.tar.gz 9278811 BLAKE2B 
b31e13f92177553adf5069cf35c8c75c7bc28f0af4d1726cdc0c6abc1c9d3baaa5be512c3a8fb9bc3c3110096a79e1c6751c701171769595a2234fc1fa8c441a
 SHA512 
f1c98d349b35b4042109d71f7db6eb8d7d089dc3241735bbd7b5402d513dcc85ca17904828779e5fc8234650fa9fb97f47c3a2f3e89cc2fb3cb9e9110439e5a2
 DIST mold-2.4.0.tar.gz 9974233 BLAKE2B 
0710d9ce0407b64b05a23e04db142d603b38d41cd9e5e322b650680ee2bd8684f57647e9a0b5efc23b2106eb1e38e38143be7d4b357b2d32e4fe0b6a99e41cca
 SHA512 
e332d027f783dfb0a4f48b1fb7daf98e11e830f8de82b971b58ee8a7bae59eaa30b8155e7491b6057f0ce8e0b09ddd0ab1d364f01ea15517e1d089fdb292a4e5
+DIST mold-2.4.1.tar.gz 9957259 BLAKE2B 
17aab84c0793dc305d53a3c2f372ddc92395b6941ffe372af55cf94f4dd65ea8d63d4e85dcdb3e76622811e5f95577d6f10612102c373835d6f75f2a3d0bcfed
 SHA512 
d61ee4306ecaa6ba5b4ce120636e70db081bb824a482bb3014429e13294134bc2560b1a9b477c47378f1062107f1c32dba2810e41be199cd6882cd1146971245

diff --git a/sys-devel/mold/mold-.ebuild b/sys-devel/mold/mold-2.4.1.ebuild
similarity index 96%
copy from sys-devel/mold/mold-.ebuild
copy to sys-devel/mold/mold-2.4.1.ebuild
index 2820eb765997..ac067b811ef2 100644
--- a/sys-devel/mold/mold-.ebuild
+++ b/sys-devel/mold/mold-2.4.1.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
@@ -31,10 +31,6 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-PATCHES=(
-   "${FILESDIR}"/${PN}-2.3.0-no-pch.patch
-)
-
 pkg_pretend() {
# Requires a c++20 compiler, see #831473
if [[ ${MERGE_TYPE} != binary ]]; then

diff --git a/sys-devel/mold/mold-.ebuild b/sys-devel/mold/mold-.ebuild
index 2820eb765997..ac067b811ef2 100644
--- a/sys-devel/mold/mold-.ebuild
+++ b/sys-devel/mold/mold-.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
@@ -31,10 +31,6 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-PATCHES=(
-   "${FILESDIR}"/${PN}-2.3.0-no-pch.patch
-)
-
 pkg_pretend() {
# Requires a c++20 compiler, see #831473
if [[ ${MERGE_TYPE} != binary ]]; then



[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2023-12-05 Thread Matthew Smith
commit: 29cae3c5271e8d00a524258fa7226b6694def2dd
Author: Matthew Smith  gentoo  org>
AuthorDate: Tue Dec  5 13:35:44 2023 +
Commit: Matthew Smith  gentoo  org>
CommitDate: Tue Dec  5 13:37:53 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29cae3c5

sys-devel/mold: set TEST_$TOOL env for tests

Use the configured compiler instead of invoking cc directly when
running tests.

Closes: https://bugs.gentoo.org/918967
Signed-off-by: Matthew Smith  gentoo.org>

 sys-devel/mold/mold-2.4.0.ebuild | 8 
 sys-devel/mold/mold-.ebuild  | 8 
 2 files changed, 16 insertions(+)

diff --git a/sys-devel/mold/mold-2.4.0.ebuild b/sys-devel/mold/mold-2.4.0.ebuild
index d1954b0e0a9d..52d41ed470e9 100644
--- a/sys-devel/mold/mold-2.4.0.ebuild
+++ b/sys-devel/mold/mold-2.4.0.ebuild
@@ -93,3 +93,11 @@ src_install() {
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-.ebuild b/sys-devel/mold/mold-.ebuild
index 2b9db9efa079..2820eb765997 100644
--- a/sys-devel/mold/mold-.ebuild
+++ b/sys-devel/mold/mold-.ebuild
@@ -93,3 +93,11 @@ src_install() {
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
+}



[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2023-12-03 Thread Sam James
commit: e31cd48465873d467ff1b19af72d67fb2c9b13b1
Author: Sam James  gentoo  org>
AuthorDate: Mon Dec  4 07:32:37 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Dec  4 07:32:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e31cd484

sys-devel/mold: Stabilize 2.3.2-r1 amd64, #917270

Signed-off-by: Sam James  gentoo.org>

 sys-devel/mold/mold-2.3.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/mold/mold-2.3.2-r1.ebuild 
b/sys-devel/mold/mold-2.3.2-r1.ebuild
index bb15b409ecae..01c4f52659a9 100644
--- a/sys-devel/mold/mold-2.3.2-r1.ebuild
+++ b/sys-devel/mold/mold-2.3.2-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} ==  ]] ; then
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"
+   KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv ~sparc ~x86"
 fi
 
 # mold (MIT)



[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2023-12-03 Thread Arthur Zamarin
commit: 5344fa9d2f7081c2e703c0c7d2b578876a680b8e
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Dec  3 16:34:24 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Dec  3 16:34:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5344fa9d

sys-devel/mold: Stabilize 2.4.0 amd64, #919113

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-devel/mold/mold-2.4.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/mold/mold-2.4.0.ebuild b/sys-devel/mold/mold-2.4.0.ebuild
index 2b9db9efa079..d1954b0e0a9d 100644
--- a/sys-devel/mold/mold-2.4.0.ebuild
+++ b/sys-devel/mold/mold-2.4.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} ==  ]] ; then
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"
+   KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv ~sparc ~x86"
 fi
 
 # mold (MIT)



[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2023-11-29 Thread Sam James
commit: 23a47cce8ca65e27f5408aa0b4e6d6eb8fb77eab
Author: Sam James  gentoo  org>
AuthorDate: Thu Nov 30 03:48:01 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Nov 30 03:48:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23a47cce

sys-devel/mold: add 2.4.0

Closes: https://bugs.gentoo.org/914849
Signed-off-by: Sam James  gentoo.org>

 sys-devel/mold/Manifest  |  1 +
 sys-devel/mold/mold-2.4.0.ebuild | 95 
 2 files changed, 96 insertions(+)

diff --git a/sys-devel/mold/Manifest b/sys-devel/mold/Manifest
index a6fd9b87cfdb..95e10eefa2bb 100644
--- a/sys-devel/mold/Manifest
+++ b/sys-devel/mold/Manifest
@@ -1,3 +1,4 @@
 DIST mold-2.1.0.tar.gz 9278811 BLAKE2B 
b31e13f92177553adf5069cf35c8c75c7bc28f0af4d1726cdc0c6abc1c9d3baaa5be512c3a8fb9bc3c3110096a79e1c6751c701171769595a2234fc1fa8c441a
 SHA512 
f1c98d349b35b4042109d71f7db6eb8d7d089dc3241735bbd7b5402d513dcc85ca17904828779e5fc8234650fa9fb97f47c3a2f3e89cc2fb3cb9e9110439e5a2
 DIST mold-2.3.2.tar.gz 9970530 BLAKE2B 
db943ad6fab336a8c9c7b5588895cc1232ebfac25fe9dd884a2fbd71ba8d76b9bf7543b4d98cbda9635a7898e980ec5dc2866ef1d02e7a80e7fb9d7f0cbca443
 SHA512 
dd98acb351757f99399b7d52589c339648478624323fd45c9e986eaf7f1a60f52ace4c09a2d20246e9340109641bda676735da9de89a277989851bd5f52ea9d0
 DIST mold-2.3.3.tar.gz 9965345 BLAKE2B 
391d9e38f13ae185c1cd9cff9cfd31c091952cf90276ccb4d7eff41beaf1fa0537bfbafafa9ffa08ab1d09db9c52aa4abcd0a765f8edc6d058f8832b35b726ad
 SHA512 
cbe82568151a772097c86a25eebb0b0f8fc769d6b767169280f535d41cd3f27fc4640da9b86fb4a495e571f9d712368dda95c4431f8ebb2b42227de2b22fc80b
+DIST mold-2.4.0.tar.gz 9974233 BLAKE2B 
0710d9ce0407b64b05a23e04db142d603b38d41cd9e5e322b650680ee2bd8684f57647e9a0b5efc23b2106eb1e38e38143be7d4b357b2d32e4fe0b6a99e41cca
 SHA512 
e332d027f783dfb0a4f48b1fb7daf98e11e830f8de82b971b58ee8a7bae59eaa30b8155e7491b6057f0ce8e0b09ddd0ab1d364f01ea15517e1d089fdb292a4e5

diff --git a/sys-devel/mold/mold-2.4.0.ebuild b/sys-devel/mold/mold-2.4.0.ebuild
new file mode 100644
index ..2b9db9efa079
--- /dev/null
+++ b/sys-devel/mold/mold-2.4.0.ebuild
@@ -0,0 +1,95 @@
+# Copyright 2021-2023 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} ==  ]] ; 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}"/${PN}-2.3.0-no-pch.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=(
+   -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)
+   -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
+}



[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/files/

2023-11-24 Thread Ulrich Müller
commit: 7e79d9f089364a8d1ae9d95f03fd6e5ecae2920b
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Thu Nov 23 17:18:26 2023 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Fri Nov 24 17:36:25 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e79d9f0

sys-devel/mold: remove unused patches

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Ulrich Müller  gentoo.org>

 .../mold/files/mold-2.0.0-DT_RELR-dependency.patch | 161 -
 .../mold/files/mold-2.0.0-reloc-test-fix.patch |  58 
 2 files changed, 219 deletions(-)

diff --git a/sys-devel/mold/files/mold-2.0.0-DT_RELR-dependency.patch 
b/sys-devel/mold/files/mold-2.0.0-DT_RELR-dependency.patch
deleted file mode 100644
index 267afde230d2..
--- a/sys-devel/mold/files/mold-2.0.0-DT_RELR-dependency.patch
+++ /dev/null
@@ -1,161 +0,0 @@
-https://bugs.gentoo.org/911591
-https://bugzilla.mozilla.org/show_bug.cgi?id=1847697
-https://github.com/rui314/mold/issues/653#event-10041847648
-https://github.com/rui314/mold/commit/f467ad1add2ab6e381e0e458f026df197e63d487
-
-From f467ad1add2ab6e381e0e458f026df197e63d487 Mon Sep 17 00:00:00 2001
-From: Rui Ueyama 
-Date: Wed, 9 Aug 2023 11:40:09 +0900
-Subject: [PATCH] Create a symbol version dependency to GLIBC_ABI_DT_RELR
-
-Fixes https://github.com/rui314/mold/issues/653

- elf/cmdline.cc |  2 ++
- elf/mold.h |  1 +
- elf/output-chunks.cc   | 44 +-
- test/elf/z-pack-relative-relocs.sh | 16 +++
- 4 files changed, 56 insertions(+), 7 deletions(-)
- create mode 100755 test/elf/z-pack-relative-relocs.sh
-
-diff --git a/elf/cmdline.cc b/elf/cmdline.cc
-index c568ce086..82a0e6869 100644
 a/elf/cmdline.cc
-+++ b/elf/cmdline.cc
-@@ -875,8 +875,10 @@ std::vector 
parse_nonpositional_args(Context ) {
-   ctx.arg.z_nodefaultlib = true;
- } else if (read_z_flag("pack-relative-relocs")) {
-   ctx.arg.pack_dyn_relocs_relr = true;
-+  ctx.arg.z_pack_relative_relocs = true;
- } else if (read_z_flag("nopack-relative-relocs")) {
-   ctx.arg.pack_dyn_relocs_relr = false;
-+  ctx.arg.z_pack_relative_relocs = false;
- } else if (read_z_flag("separate-loadable-segments")) {
-   z_separate_code = SEPARATE_LOADABLE_SEGMENTS;
- } else if (read_z_flag("separate-code")) {
-diff --git a/elf/mold.h b/elf/mold.h
-index e5532211c..3a027f1e9 100644
 a/elf/mold.h
-+++ b/elf/mold.h
-@@ -1831,6 +1831,7 @@ struct Context {
- bool z_nodefaultlib = false;
- bool z_now = false;
- bool z_origin = false;
-+bool z_pack_relative_relocs = false;
- bool z_relro = true;
- bool z_sectionheader = true;
- bool z_shstk = false;
-diff --git a/elf/output-chunks.cc b/elf/output-chunks.cc
-index 726a4da2b..3896a2991 100644
 a/elf/output-chunks.cc
-+++ b/elf/output-chunks.cc
-@@ -2373,12 +2373,13 @@ void VerneedSection::construct(Context ) {
-std::tuple(((SharedFile *)b->file)->soname, b->ver_idx);
-   });
- 
--  // Resize of .gnu.version
-+  // Resize .gnu.version
-   ctx.versym->contents.resize(ctx.dynsym->symbols.size(), 1);
-   ctx.versym->contents[0] = 0;
- 
-   // Allocate a large enough buffer for .gnu.version_r.
--  contents.resize((sizeof(ElfVerneed) + sizeof(ElfVernaux)) * 
syms.size());
-+  contents.resize((sizeof(ElfVerneed) + sizeof(ElfVernaux)) *
-+  (syms.size() + 1));
- 
-   // Fill .gnu.version_r.
-   u8 *buf = (u8 *)[0];
-@@ -2394,14 +2395,14 @@ void VerneedSection::construct(Context ) {
-   verneed->vn_next = ptr - (u8 *)verneed;
- 
- verneed = (ElfVerneed *)ptr;
--ptr += sizeof(*verneed);
-+ptr += sizeof(ElfVerneed);
- verneed->vn_version = 1;
- verneed->vn_file = ctx.dynstr->find_string(((SharedFile 
*)file)->soname);
- verneed->vn_aux = sizeof(ElfVerneed);
- aux = nullptr;
-   };
- 
--  auto add_entry = [&](Symbol *sym) {
-+  auto add_entry = [&](std::string_view verstr) {
- verneed->vn_cnt++;
- 
- if (aux)
-@@ -2409,23 +2410,52 @@ void VerneedSection::construct(Context ) {
- aux = (ElfVernaux *)ptr;
- ptr += sizeof(*aux);
- 
--std::string_view verstr = sym->get_version();
- aux->vna_hash = elf_hash(verstr);
- aux->vna_other = ++veridx;
- aux->vna_name = ctx.dynstr->add_string(verstr);
-   };
- 
-+  // Create version entries.
-   for (i64 i = 0; i < syms.size(); i++) {
- if (i == 0 || syms[i - 1]->file != syms[i]->file) {
-   start_group(syms[i]->file);
--  add_entry(syms[i]);
-+  add_entry(syms[i]->get_version());
- } else if (syms[i - 1]->ver_idx != syms[i]->ver_idx) {
--  add_entry(syms[i]);
-+  add_entry(syms[i]->get_version());
- }
- 
- ctx.versym->contents[syms[i]->get_dynsym_idx(ctx)] = veridx;
-   }
- 
-+  if (ctx.arg.z_pack_relative_relocs) {
-+// If `-z pack-relative-relocs` is specified, we'll create a .relr.dyn
-+// 

[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2023-11-15 Thread Sam James
commit: b5a2d8923b68c18b9d56d3597053f6d87b4a1083
Author: Leonardo Hernández Hernández  proton  me>
AuthorDate: Wed Nov 15 05:45:22 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Nov 15 08:54:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5a2d892

sys-devel/mold: propagate keywords to 

Signed-off-by: Leonardo Hernández Hernández  proton.me>
Signed-off-by: Sam James  gentoo.org>

 sys-devel/mold/mold-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/mold/mold-.ebuild b/sys-devel/mold/mold-.ebuild
index f602c3b96e96..2b9db9efa079 100644
--- a/sys-devel/mold/mold-.ebuild
+++ b/sys-devel/mold/mold-.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://github.com/rui314/mold/archive/refs/tags/v${PV}.tar.gz 
-> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+   KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~sparc ~x86"
 fi
 
 # mold (MIT)



[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2023-11-15 Thread Sam James
commit: f5cab0eb07996c1da5d717866f1f74b1449e9229
Author: Leonardo Hernández Hernández  proton  me>
AuthorDate: Wed Nov 15 05:40:54 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Nov 15 08:55:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5cab0eb

sys-devel/mold: add 2.3.3

Signed-off-by: Leonardo Hernández Hernández  proton.me>
Closes: https://github.com/gentoo/gentoo/pull/33829
Signed-off-by: Sam James  gentoo.org>

 sys-devel/mold/Manifest  |  1 +
 sys-devel/mold/mold-2.3.3.ebuild | 95 
 2 files changed, 96 insertions(+)

diff --git a/sys-devel/mold/Manifest b/sys-devel/mold/Manifest
index 8829ca6be6c6..a6fd9b87cfdb 100644
--- a/sys-devel/mold/Manifest
+++ b/sys-devel/mold/Manifest
@@ -1,2 +1,3 @@
 DIST mold-2.1.0.tar.gz 9278811 BLAKE2B 
b31e13f92177553adf5069cf35c8c75c7bc28f0af4d1726cdc0c6abc1c9d3baaa5be512c3a8fb9bc3c3110096a79e1c6751c701171769595a2234fc1fa8c441a
 SHA512 
f1c98d349b35b4042109d71f7db6eb8d7d089dc3241735bbd7b5402d513dcc85ca17904828779e5fc8234650fa9fb97f47c3a2f3e89cc2fb3cb9e9110439e5a2
 DIST mold-2.3.2.tar.gz 9970530 BLAKE2B 
db943ad6fab336a8c9c7b5588895cc1232ebfac25fe9dd884a2fbd71ba8d76b9bf7543b4d98cbda9635a7898e980ec5dc2866ef1d02e7a80e7fb9d7f0cbca443
 SHA512 
dd98acb351757f99399b7d52589c339648478624323fd45c9e986eaf7f1a60f52ace4c09a2d20246e9340109641bda676735da9de89a277989851bd5f52ea9d0
+DIST mold-2.3.3.tar.gz 9965345 BLAKE2B 
391d9e38f13ae185c1cd9cff9cfd31c091952cf90276ccb4d7eff41beaf1fa0537bfbafafa9ffa08ab1d09db9c52aa4abcd0a765f8edc6d058f8832b35b726ad
 SHA512 
cbe82568151a772097c86a25eebb0b0f8fc769d6b767169280f535d41cd3f27fc4640da9b86fb4a495e571f9d712368dda95c4431f8ebb2b42227de2b22fc80b

diff --git a/sys-devel/mold/mold-2.3.3.ebuild b/sys-devel/mold/mold-2.3.3.ebuild
new file mode 100644
index ..2b9db9efa079
--- /dev/null
+++ b/sys-devel/mold/mold-2.3.3.ebuild
@@ -0,0 +1,95 @@
+# Copyright 2021-2023 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} ==  ]] ; 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}"/${PN}-2.3.0-no-pch.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=(
+   -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)
+   -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
+}



[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2023-11-12 Thread Sam James
commit: 7cc0e380805c53c1225e3e6c39f88aa700dc95a5
Author: Sam James  gentoo  org>
AuthorDate: Mon Nov 13 04:32:04 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Nov 13 04:34:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cc0e380

sys-devel/mold: Keyword 2.3.2-r1 arm, #917271

Signed-off-by: Sam James  gentoo.org>

 sys-devel/mold/mold-2.3.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/mold/mold-2.3.2-r1.ebuild 
b/sys-devel/mold/mold-2.3.2-r1.ebuild
index 1ff59907edb2..61a7f65a6ba5 100644
--- a/sys-devel/mold/mold-2.3.2-r1.ebuild
+++ b/sys-devel/mold/mold-2.3.2-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://github.com/rui314/mold/archive/refs/tags/v${PV}.tar.gz 
-> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+   KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
 fi
 
 # mold (MIT)



[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2023-11-12 Thread Sam James
commit: 53bf19c80ea8a35c62eadd244e552ff0dd7f3f00
Author: Sam James  gentoo  org>
AuthorDate: Mon Nov 13 04:32:52 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Nov 13 04:34:41 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53bf19c8

sys-devel/mold: Keyword 2.3.2-r1 sparc, #917271

Signed-off-by: Sam James  gentoo.org>

 sys-devel/mold/mold-2.3.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/mold/mold-2.3.2-r1.ebuild 
b/sys-devel/mold/mold-2.3.2-r1.ebuild
index 61a7f65a6ba5..bb15b409ecae 100644
--- a/sys-devel/mold/mold-2.3.2-r1.ebuild
+++ b/sys-devel/mold/mold-2.3.2-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} ==  ]] ; then
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 ~x86"
+   KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~sparc ~x86"
 fi
 
 # mold (MIT)



[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2023-11-12 Thread Sam James
commit: cc039c0c2365fd938bdd755f1f3afa1c7d49643c
Author: Sam James  gentoo  org>
AuthorDate: Mon Nov 13 02:27:39 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Nov 13 02:27:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc039c0c

sys-devel/mold: use dosym -r, sync live

Signed-off-by: Sam James  gentoo.org>

 sys-devel/mold/mold-2.3.2-r1.ebuild | 2 +-
 sys-devel/mold/mold-.ebuild | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/sys-devel/mold/mold-2.3.2-r1.ebuild 
b/sys-devel/mold/mold-2.3.2-r1.ebuild
index 26a184843d8c..1ff59907edb2 100644
--- a/sys-devel/mold/mold-2.3.2-r1.ebuild
+++ b/sys-devel/mold/mold-2.3.2-r1.ebuild
@@ -92,5 +92,5 @@ src_install() {
 
dosym ${PN} /usr/bin/ld.${PN}
dosym ${PN} /usr/bin/ld64.${PN}
-   dosym ../../../usr/bin/${PN} /usr/libexec/${PN}/ld
+   dosym -r /usr/bin/${PN} /usr/libexec/${PN}/ld
 }

diff --git a/sys-devel/mold/mold-.ebuild b/sys-devel/mold/mold-.ebuild
index f16aabe0758e..f602c3b96e96 100644
--- a/sys-devel/mold/mold-.ebuild
+++ b/sys-devel/mold/mold-.ebuild
@@ -72,6 +72,7 @@ src_configure() {
-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)
-DMOLD_USE_SYSTEM_MIMALLOC=ON
-DMOLD_USE_SYSTEM_TBB=ON
)
@@ -90,5 +91,5 @@ src_install() {
 
dosym ${PN} /usr/bin/ld.${PN}
dosym ${PN} /usr/bin/ld64.${PN}
-   dosym ../../../usr/bin/${PN} /usr/libexec/${PN}/ld
+   dosym -r /usr/bin/${PN} /usr/libexec/${PN}/ld
 }



[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2023-11-12 Thread Sam James
commit: 9e19f1d3aa40ab4fc7c9a1341f80ce2225ccf48a
Author: Sam James  gentoo  org>
AuthorDate: Mon Nov 13 02:10:39 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Nov 13 02:10:39 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e19f1d3

sys-devel/mold: drop 1.11.0, 2.0.0-r1, 2.0.0-r2, 2.3.1

Signed-off-by: Sam James  gentoo.org>

 sys-devel/mold/Manifest |  3 --
 sys-devel/mold/mold-1.11.0.ebuild   | 89 ---
 sys-devel/mold/mold-2.0.0-r1.ebuild | 93 
 sys-devel/mold/mold-2.0.0-r2.ebuild | 94 -
 sys-devel/mold/mold-2.3.1.ebuild| 94 -
 5 files changed, 373 deletions(-)

diff --git a/sys-devel/mold/Manifest b/sys-devel/mold/Manifest
index f47a5bd61d26..8829ca6be6c6 100644
--- a/sys-devel/mold/Manifest
+++ b/sys-devel/mold/Manifest
@@ -1,5 +1,2 @@
-DIST mold-1.11.0.tar.gz 8210923 BLAKE2B 
b3854a14a956dd568625fc28c96636e7cadf81b9a93954601b03e249db0aedf726a5a1f24c0758c8189a936501ebb778b472ee6e958fe9f43cb3c3093b2dda2a
 SHA512 
a9068600dd2db757552cce027f358c0b9e6af0941b92f81c1e99e2dde674bd06cc3533d432258e42a2197d9b3f8e7bb263de281928357a79e4fb17fb19719bc0
-DIST mold-2.0.0.tar.gz 9205927 BLAKE2B 
f80c72c58f4618a74390417fdf90f816810350baf1ac74d21294f5ffba7ee263807175be531c9db77209bd05a31ad11fd84d4aeb03fb057cefac7575f71612d6
 SHA512 
11c3d1e07fe4fcc28cff58b8e432526e4604aa55b49fa47c9495e439206fb9f6a1686b1c5bd2dc907ffd7fe62ac1c72317619fc8a5d7caaa5c327de585f16827
 DIST mold-2.1.0.tar.gz 9278811 BLAKE2B 
b31e13f92177553adf5069cf35c8c75c7bc28f0af4d1726cdc0c6abc1c9d3baaa5be512c3a8fb9bc3c3110096a79e1c6751c701171769595a2234fc1fa8c441a
 SHA512 
f1c98d349b35b4042109d71f7db6eb8d7d089dc3241735bbd7b5402d513dcc85ca17904828779e5fc8234650fa9fb97f47c3a2f3e89cc2fb3cb9e9110439e5a2
-DIST mold-2.3.1.tar.gz 9958470 BLAKE2B 
917e1fd770f841dc4bf6fbbed4954762f3eccff3d01247d4a5eaee7a5dad47f0259eb8ba6a10d13f385c9f0aea4d1ac058ce40070902bf7ef366ad8225cfbd5f
 SHA512 
ea234d0b999bcd308e0c5dae27050ff61fd23971f9c54d5eb5764bfb04064dc68c33f5defd614544762a9891ce4369125a6aac68171e68de4ed09a08d59e599e
 DIST mold-2.3.2.tar.gz 9970530 BLAKE2B 
db943ad6fab336a8c9c7b5588895cc1232ebfac25fe9dd884a2fbd71ba8d76b9bf7543b4d98cbda9635a7898e980ec5dc2866ef1d02e7a80e7fb9d7f0cbca443
 SHA512 
dd98acb351757f99399b7d52589c339648478624323fd45c9e986eaf7f1a60f52ace4c09a2d20246e9340109641bda676735da9de89a277989851bd5f52ea9d0

diff --git a/sys-devel/mold/mold-1.11.0.ebuild 
b/sys-devel/mold/mold-1.11.0.ebuild
deleted file mode 100644
index 4ce10d6ee43c..
--- a/sys-devel/mold/mold-1.11.0.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 2021-2023 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} ==  ]] ; 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 ~arm64 ~ppc64 ~riscv ~x86"
-fi
-
-# mold (AGPL-3)
-#  - xxhash (BSD-2)
-LICENSE="AGPL-3 BSD-2"
-SLOT="0"
-
-RDEPEND="
-   app-arch/zstd:=
-   >=dev-cpp/tbb-2021.7.0-r1:=
-   sys-libs/zlib
-   !kernel_Darwin? (
-   >=dev-libs/mimalloc-2:=
-   dev-libs/openssl:=
-   )
-"
-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_SYSTEM_MIMALLOC=ON
-   -DMOLD_USE_SYSTEM_TBB=ON
-   )
-   cmake_src_configure
-}
-
-src_install() {
-  

[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/files/, sys-devel/mold/

2023-11-12 Thread Sam James
commit: 2fc10cbc98bebe136012849b28f6969327d6613b
Author: Sam James  gentoo  org>
AuthorDate: Mon Nov 13 02:10:14 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Nov 13 02:10:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fc10cbc

sys-devel/mold: backport symbol interposition fix (e.g. mimalloc/musl segfault)

Closes: https://bugs.gentoo.org/917089
Signed-off-by: Sam James  gentoo.org>

 ...d-2.3.2-mimalloc-visibility-interposition.patch | 495 +
 sys-devel/mold/mold-2.3.2-r1.ebuild|  96 
 2 files changed, 591 insertions(+)

diff --git 
a/sys-devel/mold/files/mold-2.3.2-mimalloc-visibility-interposition.patch 
b/sys-devel/mold/files/mold-2.3.2-mimalloc-visibility-interposition.patch
new file mode 100644
index ..e569bfaf3013
--- /dev/null
+++ b/sys-devel/mold/files/mold-2.3.2-mimalloc-visibility-interposition.patch
@@ -0,0 +1,495 @@
+https://bugs.gentoo.org/917089
+https://github.com/microsoft/mimalloc/issues/360
+https://github.com/rui314/mold/issues/1071
+https://github.com/rui314/mold/commit/da3f5dd4ecf4faaba466ba41c7c30ba4f8f73bfd
+
+From da3f5dd4ecf4faaba466ba41c7c30ba4f8f73bfd Mon Sep 17 00:00:00 2001
+From: Rui Ueyama 
+Date: Sat, 11 Nov 2023 17:59:54 +0900
+Subject: [PATCH] Fix --dynamic-list for DSOs
+
+--dynamic-list, --export-dynamic-symbol and --export-dynamic-symbol-list
+have different semantics for executables and DSOs. If the output is an
+executable, they specify a list of symbols that are to be exported.
+If the output is a shared object, they specify the list of symbols that
+are to be interposable.
+
+mold havne't implemented the latter semantics. This commit fixes that
+issue.
+
+Fixes https://github.com/rui314/mold/issues/1071
+---
+ elf/cmdline.cc  |  25 +++-
+ elf/linker-script.cc|  35 ++-
+ elf/main.cc |  16 -
+ elf/mold.h  |  17 +++--
+ elf/output-chunks.cc|   8 ++-
+ elf/passes.cc   | 122 +---
+ test/elf/dynamic-list4.sh   |  44 +
+ test/elf/version-script6.sh |   4 +-
+ 8 files changed, 194 insertions(+), 77 deletions(-)
+ create mode 100755 test/elf/dynamic-list4.sh
+
+diff --git a/elf/cmdline.cc b/elf/cmdline.cc
+index 6bc13a300..6c06b4b14 100644
+--- a/elf/cmdline.cc
 b/elf/cmdline.cc
+@@ -1104,21 +1104,21 @@ std::vector 
parse_nonpositional_args(Context ) {
+ } else if (read_flag("no-keep-memory")) {
+ } else if (read_arg("max-cache-size")) {
+ } else if (read_arg("version-script")) {
+-  // --version-script, --dynamic-list and --export-dynamic-symbol[-list]
+-  // are treated as positional arguments even though they are actually not
+-  // positional. This is because linker scripts (a positional argument)
+-  // can also specify a version script, and it's better to consolidate
+-  // parsing in read_input_files. In particular, version scripts can
+-  // modify ctx.default_version which we initialize *after* parsing
+-  // non-positional args, so the parsing cannot be done right here.
++  // --version-script is treated as positional arguments even though
++  // they are actually not positional. This is because linker scripts
++  // (a positional argument) can also specify a version script, and
++  // it's better to consolidate parsing in read_input_files. In
++  // particular, version scripts can modify ctx.default_version which
++  // we initialize *after* parsing non-positional args, so the parsing
++  // cannot be done right here.
+   remaining.push_back("--version-script=" + std::string(arg));
+ } else if (read_arg("dynamic-list")) {
+   ctx.arg.Bsymbolic = true;
+-  remaining.push_back("--dynamic-list=" + std::string(arg));
++  append(ctx.dynamic_list_patterns, parse_dynamic_list(ctx, arg));
+ } else if (read_arg("export-dynamic-symbol")) {
+-  remaining.push_back("--export-dynamic-symbol=" + std::string(arg));
++  ctx.dynamic_list_patterns.push_back({arg, ""});
+ } else if (read_arg("export-dynamic-symbol-list")) {
+-  remaining.push_back("--export-dynamic-symbol-list=" + std::string(arg));
++  append(ctx.dynamic_list_patterns, parse_dynamic_list(ctx, arg));
+ } else if (read_flag("as-needed")) {
+   remaining.push_back("--as-needed");
+ } else if (read_flag("no-as-needed")) {
+@@ -1228,11 +1228,6 @@ std::vector 
parse_nonpositional_args(Context ) {
+   if (char *env = getenv("MOLD_REPRO"); env && env[0])
+ ctx.arg.repro = true;
+ 
+-  if (ctx.arg.shared || ctx.arg.export_dynamic)
+-ctx.default_version = VER_NDX_GLOBAL;
+-  else
+-ctx.default_version = VER_NDX_LOCAL;
+-
+   if (ctx.arg.default_symver) {
+ std::string ver = ctx.arg.soname.empty() ?
+   filepath(ctx.arg.output).filename().string() : 
std::string(ctx.arg.soname);
+diff --git a/elf/linker-script.cc b/elf/linker-script.cc
+index 

[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2023-11-04 Thread Sam James
commit: bbf1ecddfd45cabb87eae1fbab5dd1e2647bd171
Author: Sam James  gentoo  org>
AuthorDate: Sat Nov  4 13:49:54 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Nov  4 13:49:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbf1ecdd

sys-devel/mold: drop 2.2.0, 2.3.0

Signed-off-by: Sam James  gentoo.org>

 sys-devel/mold/Manifest  |  2 -
 sys-devel/mold/mold-2.2.0.ebuild | 89 -
 sys-devel/mold/mold-2.3.0.ebuild | 94 
 3 files changed, 185 deletions(-)

diff --git a/sys-devel/mold/Manifest b/sys-devel/mold/Manifest
index 0e4978b9fe7f..f47a5bd61d26 100644
--- a/sys-devel/mold/Manifest
+++ b/sys-devel/mold/Manifest
@@ -1,7 +1,5 @@
 DIST mold-1.11.0.tar.gz 8210923 BLAKE2B 
b3854a14a956dd568625fc28c96636e7cadf81b9a93954601b03e249db0aedf726a5a1f24c0758c8189a936501ebb778b472ee6e958fe9f43cb3c3093b2dda2a
 SHA512 
a9068600dd2db757552cce027f358c0b9e6af0941b92f81c1e99e2dde674bd06cc3533d432258e42a2197d9b3f8e7bb263de281928357a79e4fb17fb19719bc0
 DIST mold-2.0.0.tar.gz 9205927 BLAKE2B 
f80c72c58f4618a74390417fdf90f816810350baf1ac74d21294f5ffba7ee263807175be531c9db77209bd05a31ad11fd84d4aeb03fb057cefac7575f71612d6
 SHA512 
11c3d1e07fe4fcc28cff58b8e432526e4604aa55b49fa47c9495e439206fb9f6a1686b1c5bd2dc907ffd7fe62ac1c72317619fc8a5d7caaa5c327de585f16827
 DIST mold-2.1.0.tar.gz 9278811 BLAKE2B 
b31e13f92177553adf5069cf35c8c75c7bc28f0af4d1726cdc0c6abc1c9d3baaa5be512c3a8fb9bc3c3110096a79e1c6751c701171769595a2234fc1fa8c441a
 SHA512 
f1c98d349b35b4042109d71f7db6eb8d7d089dc3241735bbd7b5402d513dcc85ca17904828779e5fc8234650fa9fb97f47c3a2f3e89cc2fb3cb9e9110439e5a2
-DIST mold-2.2.0.tar.gz 9956678 BLAKE2B 
495772b5bfd238a6785676d277da87fe4f10b64513f8f0a4961893e4ae8954ad8bda3d09283de14594d7d056d6c1aeed5be591d6a64868a473eb45737d3b9340
 SHA512 
1692d1ff154335fdff91a4fafebb3514ed6742035c14e74ec7e552b90428a1cd5341baba9183158b44ae221fd19e86da55e7f04bde317b943a24d0afecb41002
-DIST mold-2.3.0.tar.gz 9958893 BLAKE2B 
86235731953902a5cd8fdba8b41d456bd60bf53b96a9e1cc89bdf991a75367b95e5522887be8e9c28f3d777b143ef5d693ff50293188ef222fc45257ce990d24
 SHA512 
7953cff8f2e9f775f0890aedc5f38ef07aac16118310ee9e1a2a82be8abafa1aa05459a136181978c55763737c7ff47815afdd4423e8f96db8f0237fce13e6b4
 DIST mold-2.3.1.tar.gz 9958470 BLAKE2B 
917e1fd770f841dc4bf6fbbed4954762f3eccff3d01247d4a5eaee7a5dad47f0259eb8ba6a10d13f385c9f0aea4d1ac058ce40070902bf7ef366ad8225cfbd5f
 SHA512 
ea234d0b999bcd308e0c5dae27050ff61fd23971f9c54d5eb5764bfb04064dc68c33f5defd614544762a9891ce4369125a6aac68171e68de4ed09a08d59e599e
 DIST mold-2.3.2.tar.gz 9970530 BLAKE2B 
db943ad6fab336a8c9c7b5588895cc1232ebfac25fe9dd884a2fbd71ba8d76b9bf7543b4d98cbda9635a7898e980ec5dc2866ef1d02e7a80e7fb9d7f0cbca443
 SHA512 
dd98acb351757f99399b7d52589c339648478624323fd45c9e986eaf7f1a60f52ace4c09a2d20246e9340109641bda676735da9de89a277989851bd5f52ea9d0

diff --git a/sys-devel/mold/mold-2.2.0.ebuild b/sys-devel/mold/mold-2.2.0.ebuild
deleted file mode 100644
index 0cb1c6819eb1..
--- a/sys-devel/mold/mold-2.2.0.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 2021-2023 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} ==  ]] ; 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 ~arm64 ~loong ~riscv ~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 

[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2023-11-04 Thread Sam James
commit: 7e470b9c5ee7a4180c63816b85c8c88b271148d6
Author: Sam James  gentoo  org>
AuthorDate: Sat Nov  4 13:49:20 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Nov  4 13:49:20 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e470b9c

sys-devel/mold: add 2.3.2

Signed-off-by: Sam James  gentoo.org>

 sys-devel/mold/Manifest  |  1 +
 sys-devel/mold/mold-2.3.2.ebuild | 95 
 2 files changed, 96 insertions(+)

diff --git a/sys-devel/mold/Manifest b/sys-devel/mold/Manifest
index dc26eba27e96..0e4978b9fe7f 100644
--- a/sys-devel/mold/Manifest
+++ b/sys-devel/mold/Manifest
@@ -4,3 +4,4 @@ DIST mold-2.1.0.tar.gz 9278811 BLAKE2B 
b31e13f92177553adf5069cf35c8c75c7bc28f0af
 DIST mold-2.2.0.tar.gz 9956678 BLAKE2B 
495772b5bfd238a6785676d277da87fe4f10b64513f8f0a4961893e4ae8954ad8bda3d09283de14594d7d056d6c1aeed5be591d6a64868a473eb45737d3b9340
 SHA512 
1692d1ff154335fdff91a4fafebb3514ed6742035c14e74ec7e552b90428a1cd5341baba9183158b44ae221fd19e86da55e7f04bde317b943a24d0afecb41002
 DIST mold-2.3.0.tar.gz 9958893 BLAKE2B 
86235731953902a5cd8fdba8b41d456bd60bf53b96a9e1cc89bdf991a75367b95e5522887be8e9c28f3d777b143ef5d693ff50293188ef222fc45257ce990d24
 SHA512 
7953cff8f2e9f775f0890aedc5f38ef07aac16118310ee9e1a2a82be8abafa1aa05459a136181978c55763737c7ff47815afdd4423e8f96db8f0237fce13e6b4
 DIST mold-2.3.1.tar.gz 9958470 BLAKE2B 
917e1fd770f841dc4bf6fbbed4954762f3eccff3d01247d4a5eaee7a5dad47f0259eb8ba6a10d13f385c9f0aea4d1ac058ce40070902bf7ef366ad8225cfbd5f
 SHA512 
ea234d0b999bcd308e0c5dae27050ff61fd23971f9c54d5eb5764bfb04064dc68c33f5defd614544762a9891ce4369125a6aac68171e68de4ed09a08d59e599e
+DIST mold-2.3.2.tar.gz 9970530 BLAKE2B 
db943ad6fab336a8c9c7b5588895cc1232ebfac25fe9dd884a2fbd71ba8d76b9bf7543b4d98cbda9635a7898e980ec5dc2866ef1d02e7a80e7fb9d7f0cbca443
 SHA512 
dd98acb351757f99399b7d52589c339648478624323fd45c9e986eaf7f1a60f52ace4c09a2d20246e9340109641bda676735da9de89a277989851bd5f52ea9d0

diff --git a/sys-devel/mold/mold-2.3.2.ebuild b/sys-devel/mold/mold-2.3.2.ebuild
new file mode 100644
index ..20299cb6b4cb
--- /dev/null
+++ b/sys-devel/mold/mold-2.3.2.ebuild
@@ -0,0 +1,95 @@
+# Copyright 2021-2023 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} ==  ]] ; 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 ~arm64 ~loong ~riscv ~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}"/${PN}-2.3.0-no-pch.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=(
+   -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)
+   -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 

[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2023-10-21 Thread Sam James
commit: cd971d4f0c972d4a861607c7b919dab1433e875b
Author: Leonardo Hernández Hernández  proton  me>
AuthorDate: Sat Oct 21 16:55:58 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct 21 17:48:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd971d4f

sys-devel/mold: add 2.3.1

Signed-off-by: Leonardo Hernández Hernández  proton.me>
Closes: https://github.com/gentoo/gentoo/pull/33445
Signed-off-by: Sam James  gentoo.org>

 sys-devel/mold/Manifest  |  1 +
 sys-devel/mold/mold-2.3.1.ebuild | 94 
 2 files changed, 95 insertions(+)

diff --git a/sys-devel/mold/Manifest b/sys-devel/mold/Manifest
index 6cb0c98c07e3..dc26eba27e96 100644
--- a/sys-devel/mold/Manifest
+++ b/sys-devel/mold/Manifest
@@ -3,3 +3,4 @@ DIST mold-2.0.0.tar.gz 9205927 BLAKE2B 
f80c72c58f4618a74390417fdf90f816810350baf
 DIST mold-2.1.0.tar.gz 9278811 BLAKE2B 
b31e13f92177553adf5069cf35c8c75c7bc28f0af4d1726cdc0c6abc1c9d3baaa5be512c3a8fb9bc3c3110096a79e1c6751c701171769595a2234fc1fa8c441a
 SHA512 
f1c98d349b35b4042109d71f7db6eb8d7d089dc3241735bbd7b5402d513dcc85ca17904828779e5fc8234650fa9fb97f47c3a2f3e89cc2fb3cb9e9110439e5a2
 DIST mold-2.2.0.tar.gz 9956678 BLAKE2B 
495772b5bfd238a6785676d277da87fe4f10b64513f8f0a4961893e4ae8954ad8bda3d09283de14594d7d056d6c1aeed5be591d6a64868a473eb45737d3b9340
 SHA512 
1692d1ff154335fdff91a4fafebb3514ed6742035c14e74ec7e552b90428a1cd5341baba9183158b44ae221fd19e86da55e7f04bde317b943a24d0afecb41002
 DIST mold-2.3.0.tar.gz 9958893 BLAKE2B 
86235731953902a5cd8fdba8b41d456bd60bf53b96a9e1cc89bdf991a75367b95e5522887be8e9c28f3d777b143ef5d693ff50293188ef222fc45257ce990d24
 SHA512 
7953cff8f2e9f775f0890aedc5f38ef07aac16118310ee9e1a2a82be8abafa1aa05459a136181978c55763737c7ff47815afdd4423e8f96db8f0237fce13e6b4
+DIST mold-2.3.1.tar.gz 9958470 BLAKE2B 
917e1fd770f841dc4bf6fbbed4954762f3eccff3d01247d4a5eaee7a5dad47f0259eb8ba6a10d13f385c9f0aea4d1ac058ce40070902bf7ef366ad8225cfbd5f
 SHA512 
ea234d0b999bcd308e0c5dae27050ff61fd23971f9c54d5eb5764bfb04064dc68c33f5defd614544762a9891ce4369125a6aac68171e68de4ed09a08d59e599e

diff --git a/sys-devel/mold/mold-2.3.1.ebuild b/sys-devel/mold/mold-2.3.1.ebuild
new file mode 100644
index ..f16aabe0758e
--- /dev/null
+++ b/sys-devel/mold/mold-2.3.1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 2021-2023 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} ==  ]] ; 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 ~arm64 ~loong ~riscv ~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}"/${PN}-2.3.0-no-pch.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=(
+   -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_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}
+

[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/, sys-devel/mold/files/

2023-10-18 Thread Sam James
commit: 048526669f36e549fb4847126ab510a42de361a9
Author: Sam James  gentoo  org>
AuthorDate: Wed Oct 18 15:41:14 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Oct 18 15:42:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04852666

sys-devel/mold: add 2.3.0, disable PCH

PCH is buggy and not worth it (especially for clean builds where we're not
installing any headers too...)

Signed-off-by: Sam James  gentoo.org>

 sys-devel/mold/Manifest|  1 +
 sys-devel/mold/files/mold-2.3.0-no-pch.patch   | 12 
 sys-devel/mold/{mold-.ebuild => mold-2.3.0.ebuild} |  7 ++-
 sys-devel/mold/mold-.ebuild|  7 ++-
 4 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/sys-devel/mold/Manifest b/sys-devel/mold/Manifest
index 9c33e11ccd3f..6cb0c98c07e3 100644
--- a/sys-devel/mold/Manifest
+++ b/sys-devel/mold/Manifest
@@ -2,3 +2,4 @@ DIST mold-1.11.0.tar.gz 8210923 BLAKE2B 
b3854a14a956dd568625fc28c96636e7cadf81b9
 DIST mold-2.0.0.tar.gz 9205927 BLAKE2B 
f80c72c58f4618a74390417fdf90f816810350baf1ac74d21294f5ffba7ee263807175be531c9db77209bd05a31ad11fd84d4aeb03fb057cefac7575f71612d6
 SHA512 
11c3d1e07fe4fcc28cff58b8e432526e4604aa55b49fa47c9495e439206fb9f6a1686b1c5bd2dc907ffd7fe62ac1c72317619fc8a5d7caaa5c327de585f16827
 DIST mold-2.1.0.tar.gz 9278811 BLAKE2B 
b31e13f92177553adf5069cf35c8c75c7bc28f0af4d1726cdc0c6abc1c9d3baaa5be512c3a8fb9bc3c3110096a79e1c6751c701171769595a2234fc1fa8c441a
 SHA512 
f1c98d349b35b4042109d71f7db6eb8d7d089dc3241735bbd7b5402d513dcc85ca17904828779e5fc8234650fa9fb97f47c3a2f3e89cc2fb3cb9e9110439e5a2
 DIST mold-2.2.0.tar.gz 9956678 BLAKE2B 
495772b5bfd238a6785676d277da87fe4f10b64513f8f0a4961893e4ae8954ad8bda3d09283de14594d7d056d6c1aeed5be591d6a64868a473eb45737d3b9340
 SHA512 
1692d1ff154335fdff91a4fafebb3514ed6742035c14e74ec7e552b90428a1cd5341baba9183158b44ae221fd19e86da55e7f04bde317b943a24d0afecb41002
+DIST mold-2.3.0.tar.gz 9958893 BLAKE2B 
86235731953902a5cd8fdba8b41d456bd60bf53b96a9e1cc89bdf991a75367b95e5522887be8e9c28f3d777b143ef5d693ff50293188ef222fc45257ce990d24
 SHA512 
7953cff8f2e9f775f0890aedc5f38ef07aac16118310ee9e1a2a82be8abafa1aa05459a136181978c55763737c7ff47815afdd4423e8f96db8f0237fce13e6b4

diff --git a/sys-devel/mold/files/mold-2.3.0-no-pch.patch 
b/sys-devel/mold/files/mold-2.3.0-no-pch.patch
new file mode 100644
index ..e61b5df01f54
--- /dev/null
+++ b/sys-devel/mold/files/mold-2.3.0-no-pch.patch
@@ -0,0 +1,12 @@
+We generally disable PCH in Gentoo because of how buggy it is.
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -400,7 +400,7 @@ endif()
+ 
+ # Add frequently included header files for pre-compiling.
+ # target_precompile_headers is supported by CMake 3.16.0 or newer.
+-if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.16.0")
++if(FALSE)
+   if(MOLD_IS_SOLD)
+ target_precompile_headers(mold PRIVATE
+   "$<$:${CMAKE_SOURCE_DIR}/elf/mold.h>"

diff --git a/sys-devel/mold/mold-.ebuild b/sys-devel/mold/mold-2.3.0.ebuild
similarity index 93%
copy from sys-devel/mold/mold-.ebuild
copy to sys-devel/mold/mold-2.3.0.ebuild
index 42cd25dd9155..f16aabe0758e 100644
--- a/sys-devel/mold/mold-.ebuild
+++ b/sys-devel/mold/mold-2.3.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://github.com/rui314/mold/archive/refs/tags/v${PV}.tar.gz 
-> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~loong"
+   KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
 fi
 
 # mold (MIT)
@@ -31,6 +31,10 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+   "${FILESDIR}"/${PN}-2.3.0-no-pch.patch
+)
+
 pkg_pretend() {
# Requires a c++20 compiler, see #831473
if [[ ${MERGE_TYPE} != binary ]]; then
@@ -65,6 +69,7 @@ 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_SYSTEM_MIMALLOC=ON

diff --git a/sys-devel/mold/mold-.ebuild b/sys-devel/mold/mold-.ebuild
index 42cd25dd9155..f16aabe0758e 100644
--- a/sys-devel/mold/mold-.ebuild
+++ b/sys-devel/mold/mold-.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://github.com/rui314/mold/archive/refs/tags/v${PV}.tar.gz 
-> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~loong"
+   KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
 fi
 
 # mold (MIT)
@@ -31,6 +31,10 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+   "${FILESDIR}"/${PN}-2.3.0-no-pch.patch
+)
+
 pkg_pretend() {
# Requires a c++20 compiler, see #831473
if [[ ${MERGE_TYPE} != binary ]]; then
@@ -65,6 +69,7 @@ src_prepare() {
 
 src_configure() {
local mycmakeargs=(
+   -DCMAKE_DISABLE_PRECOMPILE_HEADERS=ON
-DMOLD_ENABLE_QEMU_TESTS=OFF

[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2023-09-27 Thread Arthur Zamarin
commit: d9e964554518eaf9805765114740b2a7a8a9eb81
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Sep 27 13:28:09 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Sep 27 13:28:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9e96455

sys-devel/mold: Stabilize 2.1.0 amd64, #914787

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-devel/mold/mold-2.1.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/mold/mold-2.1.0.ebuild b/sys-devel/mold/mold-2.1.0.ebuild
index 719308108edf..4140d61806dd 100644
--- a/sys-devel/mold/mold-2.1.0.ebuild
+++ b/sys-devel/mold/mold-2.1.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://github.com/rui314/mold/archive/refs/tags/v${PV}.tar.gz 
-> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+   KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 fi
 
 # mold (MIT)



[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2023-09-24 Thread Arthur Zamarin
commit: d5cf2360bacf39e8e0109c2fe7af5b5db92e6be4
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Sep 24 15:44:22 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Sep 24 15:44:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5cf2360

sys-devel/mold: Keyword 2.2.0 arm64, #914592

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-devel/mold/mold-2.2.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/mold/mold-2.2.0.ebuild b/sys-devel/mold/mold-2.2.0.ebuild
index 16ecf90ddcc2..0cb1c6819eb1 100644
--- a/sys-devel/mold/mold-2.2.0.ebuild
+++ b/sys-devel/mold/mold-2.2.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://github.com/rui314/mold/archive/refs/tags/v${PV}.tar.gz 
-> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~loong ~riscv ~x86"
+   KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
 fi
 
 # mold (MIT)



[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2023-09-24 Thread Arthur Zamarin
commit: 84244fc0f5a2dfce13539106b0acef8c75ffc419
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Sep 24 14:24:54 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Sep 24 14:24:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84244fc0

sys-devel/mold: Keyword 2.2.0 x86, #914592

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-devel/mold/mold-2.2.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/mold/mold-2.2.0.ebuild b/sys-devel/mold/mold-2.2.0.ebuild
index bdb6e5ef63b5..16ecf90ddcc2 100644
--- a/sys-devel/mold/mold-2.2.0.ebuild
+++ b/sys-devel/mold/mold-2.2.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://github.com/rui314/mold/archive/refs/tags/v${PV}.tar.gz 
-> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~loong ~riscv"
+   KEYWORDS="~amd64 ~loong ~riscv ~x86"
 fi
 
 # mold (MIT)



[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2023-09-24 Thread Jakov Smolić
commit: 0b041c1a1238382b05da1ef7efd46100d7014242
Author: Jakov Smolić  gentoo  org>
AuthorDate: Sun Sep 24 13:43:22 2023 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sun Sep 24 13:43:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b041c1a

sys-devel/mold: Keyword 2.2.0 riscv, #914592

Signed-off-by: Jakov Smolić  gentoo.org>

 sys-devel/mold/mold-2.2.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/mold/mold-2.2.0.ebuild b/sys-devel/mold/mold-2.2.0.ebuild
index 42cd25dd9155..bdb6e5ef63b5 100644
--- a/sys-devel/mold/mold-2.2.0.ebuild
+++ b/sys-devel/mold/mold-2.2.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://github.com/rui314/mold/archive/refs/tags/v${PV}.tar.gz 
-> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~loong"
+   KEYWORDS="~amd64 ~loong ~riscv"
 fi
 
 # mold (MIT)



[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2023-09-24 Thread WANG Xuerui
commit: b992382a942064aacb32c0dbd30c6ffecd71917f
Author: WANG Xuerui  gentoo  org>
AuthorDate: Sun Sep 24 08:49:40 2023 +
Commit: WANG Xuerui  gentoo  org>
CommitDate: Sun Sep 24 09:01:51 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b992382a

sys-devel/mold: forward ~loong

Signed-off-by: WANG Xuerui  gentoo.org>

 sys-devel/mold/mold-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/mold/mold-.ebuild b/sys-devel/mold/mold-.ebuild
index 02f597181e3e..42cd25dd9155 100644
--- a/sys-devel/mold/mold-.ebuild
+++ b/sys-devel/mold/mold-.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://github.com/rui314/mold/archive/refs/tags/v${PV}.tar.gz 
-> ${P}.tar.gz"
-   KEYWORDS="~amd64"
+   KEYWORDS="~amd64 ~loong"
 fi
 
 # mold (MIT)



[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2023-09-24 Thread WANG Xuerui
commit: fa4925481dd65934c9ee40776931fdd36d59ca8e
Author: WANG Xuerui  gentoo  org>
AuthorDate: Sun Sep 24 08:49:36 2023 +
Commit: WANG Xuerui  gentoo  org>
CommitDate: Sun Sep 24 09:01:51 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa492548

sys-devel/mold: keyword 2.2.0 for ~loong

Signed-off-by: WANG Xuerui  gentoo.org>

 sys-devel/mold/mold-2.2.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/mold/mold-2.2.0.ebuild b/sys-devel/mold/mold-2.2.0.ebuild
index 02f597181e3e..42cd25dd9155 100644
--- a/sys-devel/mold/mold-2.2.0.ebuild
+++ b/sys-devel/mold/mold-2.2.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://github.com/rui314/mold/archive/refs/tags/v${PV}.tar.gz 
-> ${P}.tar.gz"
-   KEYWORDS="~amd64"
+   KEYWORDS="~amd64 ~loong"
 fi
 
 # mold (MIT)



[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2023-09-24 Thread Sam James
commit: 8d6eb63d3898cc964cab65809b3aa6eaa4a05af6
Author: Sam James  gentoo  org>
AuthorDate: Sun Sep 24 07:29:29 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Sep 24 07:30:06 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d6eb63d

sys-devel/mold: add 2.2.0

Signed-off-by: Sam James  gentoo.org>

 sys-devel/mold/Manifest  |  1 +
 sys-devel/mold/mold-2.2.0.ebuild | 89 
 2 files changed, 90 insertions(+)

diff --git a/sys-devel/mold/Manifest b/sys-devel/mold/Manifest
index d02185001a8c..9c33e11ccd3f 100644
--- a/sys-devel/mold/Manifest
+++ b/sys-devel/mold/Manifest
@@ -1,3 +1,4 @@
 DIST mold-1.11.0.tar.gz 8210923 BLAKE2B 
b3854a14a956dd568625fc28c96636e7cadf81b9a93954601b03e249db0aedf726a5a1f24c0758c8189a936501ebb778b472ee6e958fe9f43cb3c3093b2dda2a
 SHA512 
a9068600dd2db757552cce027f358c0b9e6af0941b92f81c1e99e2dde674bd06cc3533d432258e42a2197d9b3f8e7bb263de281928357a79e4fb17fb19719bc0
 DIST mold-2.0.0.tar.gz 9205927 BLAKE2B 
f80c72c58f4618a74390417fdf90f816810350baf1ac74d21294f5ffba7ee263807175be531c9db77209bd05a31ad11fd84d4aeb03fb057cefac7575f71612d6
 SHA512 
11c3d1e07fe4fcc28cff58b8e432526e4604aa55b49fa47c9495e439206fb9f6a1686b1c5bd2dc907ffd7fe62ac1c72317619fc8a5d7caaa5c327de585f16827
 DIST mold-2.1.0.tar.gz 9278811 BLAKE2B 
b31e13f92177553adf5069cf35c8c75c7bc28f0af4d1726cdc0c6abc1c9d3baaa5be512c3a8fb9bc3c3110096a79e1c6751c701171769595a2234fc1fa8c441a
 SHA512 
f1c98d349b35b4042109d71f7db6eb8d7d089dc3241735bbd7b5402d513dcc85ca17904828779e5fc8234650fa9fb97f47c3a2f3e89cc2fb3cb9e9110439e5a2
+DIST mold-2.2.0.tar.gz 9956678 BLAKE2B 
495772b5bfd238a6785676d277da87fe4f10b64513f8f0a4961893e4ae8954ad8bda3d09283de14594d7d056d6c1aeed5be591d6a64868a473eb45737d3b9340
 SHA512 
1692d1ff154335fdff91a4fafebb3514ed6742035c14e74ec7e552b90428a1cd5341baba9183158b44ae221fd19e86da55e7f04bde317b943a24d0afecb41002

diff --git a/sys-devel/mold/mold-2.2.0.ebuild b/sys-devel/mold/mold-2.2.0.ebuild
new file mode 100644
index ..02f597181e3e
--- /dev/null
+++ b/sys-devel/mold/mold-2.2.0.ebuild
@@ -0,0 +1,89 @@
+# Copyright 2021-2023 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} ==  ]] ; 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"
+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_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 ../../../usr/bin/${PN} /usr/libexec/${PN}/ld
+}



[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2023-09-02 Thread Sam James
commit: 6d93aaf938cd8684a7b9157bae18aeb84f1b779d
Author: Sam James  gentoo  org>
AuthorDate: Sat Sep  2 12:03:54 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Sep  2 12:03:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d93aaf9

sys-devel/mold: Stabilize 2.0.0-r1 amd64, #913491

Signed-off-by: Sam James  gentoo.org>

 sys-devel/mold/mold-2.0.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/mold/mold-2.0.0-r1.ebuild 
b/sys-devel/mold/mold-2.0.0-r1.ebuild
index 6d863f669627..74b7d3ab089c 100644
--- a/sys-devel/mold/mold-2.0.0-r1.ebuild
+++ b/sys-devel/mold/mold-2.0.0-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://github.com/rui314/mold/archive/refs/tags/v${PV}.tar.gz 
-> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+   KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 fi
 
 # mold (MIT)



[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2023-08-24 Thread Matthew Smith
commit: 4748a3125594dd48688221e528b0f314ab330dd6
Author: Matthew Smith  gentoo  org>
AuthorDate: Thu Aug 24 18:19:26 2023 +
Commit: Matthew Smith  gentoo  org>
CommitDate: Thu Aug 24 18:21:58 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4748a312

sys-devel/mold: update live ebuild

- remove openssl dependency
- add blake3 dependency, update keywords to match

Bug: https://bugs.gentoo.org/912967
Signed-off-by: Matthew Smith  gentoo.org>

 sys-devel/mold/mold-.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-devel/mold/mold-.ebuild b/sys-devel/mold/mold-.ebuild
index b355518cedf4..02f597181e3e 100644
--- a/sys-devel/mold/mold-.ebuild
+++ b/sys-devel/mold/mold-.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://github.com/rui314/mold/archive/refs/tags/v${PV}.tar.gz 
-> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+   KEYWORDS="~amd64"
 fi
 
 # mold (MIT)
@@ -23,10 +23,10 @@ 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:=
-   dev-libs/openssl:=
)
 "
 DEPEND="${RDEPEND}"



[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2023-08-23 Thread WANG Xuerui
commit: 4a80425926d0dd07e3fae9aa564d2dba87386015
Author: WANG Xuerui  gentoo  org>
AuthorDate: Wed Aug 23 16:01:20 2023 +
Commit: WANG Xuerui  gentoo  org>
CommitDate: Wed Aug 23 16:36:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a804259

sys-devel/mold: keyword 2.1.0 for ~loong

Signed-off-by: WANG Xuerui  gentoo.org>

 sys-devel/mold/mold-2.1.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/mold/mold-2.1.0.ebuild b/sys-devel/mold/mold-2.1.0.ebuild
index b355518cedf4..719308108edf 100644
--- a/sys-devel/mold/mold-2.1.0.ebuild
+++ b/sys-devel/mold/mold-2.1.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://github.com/rui314/mold/archive/refs/tags/v${PV}.tar.gz 
-> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+   KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 fi
 
 # mold (MIT)



[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2023-08-12 Thread Sam James
commit: 0f9358bc148fc6336316e258ccb4c6de4d2e2085
Author: Sam James  gentoo  org>
AuthorDate: Sun Aug 13 05:15:57 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Aug 13 05:15:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f9358bc

sys-devel/mold: add 2.1.0

Signed-off-by: Sam James  gentoo.org>

 sys-devel/mold/Manifest  |  1 +
 sys-devel/mold/mold-2.1.0.ebuild | 89 
 2 files changed, 90 insertions(+)

diff --git a/sys-devel/mold/Manifest b/sys-devel/mold/Manifest
index 1cecfaf15e02..d02185001a8c 100644
--- a/sys-devel/mold/Manifest
+++ b/sys-devel/mold/Manifest
@@ -1,2 +1,3 @@
 DIST mold-1.11.0.tar.gz 8210923 BLAKE2B 
b3854a14a956dd568625fc28c96636e7cadf81b9a93954601b03e249db0aedf726a5a1f24c0758c8189a936501ebb778b472ee6e958fe9f43cb3c3093b2dda2a
 SHA512 
a9068600dd2db757552cce027f358c0b9e6af0941b92f81c1e99e2dde674bd06cc3533d432258e42a2197d9b3f8e7bb263de281928357a79e4fb17fb19719bc0
 DIST mold-2.0.0.tar.gz 9205927 BLAKE2B 
f80c72c58f4618a74390417fdf90f816810350baf1ac74d21294f5ffba7ee263807175be531c9db77209bd05a31ad11fd84d4aeb03fb057cefac7575f71612d6
 SHA512 
11c3d1e07fe4fcc28cff58b8e432526e4604aa55b49fa47c9495e439206fb9f6a1686b1c5bd2dc907ffd7fe62ac1c72317619fc8a5d7caaa5c327de585f16827
+DIST mold-2.1.0.tar.gz 9278811 BLAKE2B 
b31e13f92177553adf5069cf35c8c75c7bc28f0af4d1726cdc0c6abc1c9d3baaa5be512c3a8fb9bc3c3110096a79e1c6751c701171769595a2234fc1fa8c441a
 SHA512 
f1c98d349b35b4042109d71f7db6eb8d7d089dc3241735bbd7b5402d513dcc85ca17904828779e5fc8234650fa9fb97f47c3a2f3e89cc2fb3cb9e9110439e5a2

diff --git a/sys-devel/mold/mold-2.1.0.ebuild b/sys-devel/mold/mold-2.1.0.ebuild
new file mode 100644
index ..b355518cedf4
--- /dev/null
+++ b/sys-devel/mold/mold-2.1.0.ebuild
@@ -0,0 +1,89 @@
+# Copyright 2021-2023 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} ==  ]] ; 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 ~arm64 ~ppc64 ~riscv ~x86"
+fi
+
+# mold (MIT)
+#  - xxhash (BSD-2)
+LICENSE="MIT BSD-2"
+SLOT="0"
+
+RDEPEND="
+   app-arch/zstd:=
+   >=dev-cpp/tbb-2021.7.0-r1:=
+   sys-libs/zlib
+   !kernel_Darwin? (
+   >=dev-libs/mimalloc-2:=
+   dev-libs/openssl:=
+   )
+"
+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_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 ../../../usr/bin/${PN} /usr/libexec/${PN}/ld
+}



[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2023-08-08 Thread Sam James
commit: 5c57f4a2067ec3fe13f181ab05d7ace48bfaf4ac
Author: Sam James  gentoo  org>
AuthorDate: Wed Aug  9 03:06:33 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Aug  9 03:11:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c57f4a2

sys-devel/mold: drop 1.10.1, 2.0.0

Signed-off-by: Sam James  gentoo.org>

 sys-devel/mold/Manifest   |  1 -
 sys-devel/mold/mold-1.10.1.ebuild | 89 ---
 sys-devel/mold/mold-2.0.0.ebuild  | 89 ---
 3 files changed, 179 deletions(-)

diff --git a/sys-devel/mold/Manifest b/sys-devel/mold/Manifest
index 45952667e42c..1cecfaf15e02 100644
--- a/sys-devel/mold/Manifest
+++ b/sys-devel/mold/Manifest
@@ -1,3 +1,2 @@
-DIST mold-1.10.1.tar.gz 8173701 BLAKE2B 
142b4ec6297f1d4eb7576d16603a214244216592df7320639da3fce32890fc3d13e681dcb79ed23e4c0c7dba1f97eb10c622052c67787b6699925ae67ddb1d15
 SHA512 
b9df5ddc3a3a022523506638309373c3440128f3c702a7db69c44c180177148e92fbf73347be0c4e0e890395cfb2a5b12d2650ee267f9f58212ccfa981519bbf
 DIST mold-1.11.0.tar.gz 8210923 BLAKE2B 
b3854a14a956dd568625fc28c96636e7cadf81b9a93954601b03e249db0aedf726a5a1f24c0758c8189a936501ebb778b472ee6e958fe9f43cb3c3093b2dda2a
 SHA512 
a9068600dd2db757552cce027f358c0b9e6af0941b92f81c1e99e2dde674bd06cc3533d432258e42a2197d9b3f8e7bb263de281928357a79e4fb17fb19719bc0
 DIST mold-2.0.0.tar.gz 9205927 BLAKE2B 
f80c72c58f4618a74390417fdf90f816810350baf1ac74d21294f5ffba7ee263807175be531c9db77209bd05a31ad11fd84d4aeb03fb057cefac7575f71612d6
 SHA512 
11c3d1e07fe4fcc28cff58b8e432526e4604aa55b49fa47c9495e439206fb9f6a1686b1c5bd2dc907ffd7fe62ac1c72317619fc8a5d7caaa5c327de585f16827

diff --git a/sys-devel/mold/mold-1.10.1.ebuild 
b/sys-devel/mold/mold-1.10.1.ebuild
deleted file mode 100644
index a574dbeb3b3a..
--- a/sys-devel/mold/mold-1.10.1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 2021-2023 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} ==  ]] ; 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 ~ppc64 ~riscv ~x86"
-fi
-
-# mold (AGPL-3)
-#  - xxhash (BSD-2)
-LICENSE="AGPL-3 BSD-2"
-SLOT="0"
-
-RDEPEND="
-   app-arch/zstd:=
-   >=dev-cpp/tbb-2021.7.0-r1:=
-   sys-libs/zlib
-   !kernel_Darwin? (
-   >=dev-libs/mimalloc-2:=
-   dev-libs/openssl:=
-   )
-"
-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_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 ../../../usr/bin/${PN} /usr/libexec/${PN}/ld
-}

diff --git a/sys-devel/mold/mold-2.0.0.ebuild b/sys-devel/mold/mold-2.0.0.ebuild
deleted file mode 100644
index b355518cedf4..
--- a/sys-devel/mold/mold-2.0.0.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake toolchain-funcs
-
-DESCRIPTION="A Modern Linker"

[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/, sys-devel/mold/files/

2023-08-08 Thread Sam James
commit: 0b8e1cc4c541041f00338d897d34fabe66ae87b8
Author: Sam James  gentoo  org>
AuthorDate: Wed Aug  9 03:10:49 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Aug  9 03:11:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b8e1cc4

sys-devel/mold: backport DT_RELR fix

Bug: https://bugs.gentoo.org/911591
Signed-off-by: Sam James  gentoo.org>

 .../mold/files/mold-2.0.0-DT_RELR-dependency.patch | 161 +
 sys-devel/mold/mold-2.0.0-r2.ebuild|  94 
 2 files changed, 255 insertions(+)

diff --git a/sys-devel/mold/files/mold-2.0.0-DT_RELR-dependency.patch 
b/sys-devel/mold/files/mold-2.0.0-DT_RELR-dependency.patch
new file mode 100644
index ..267afde230d2
--- /dev/null
+++ b/sys-devel/mold/files/mold-2.0.0-DT_RELR-dependency.patch
@@ -0,0 +1,161 @@
+https://bugs.gentoo.org/911591
+https://bugzilla.mozilla.org/show_bug.cgi?id=1847697
+https://github.com/rui314/mold/issues/653#event-10041847648
+https://github.com/rui314/mold/commit/f467ad1add2ab6e381e0e458f026df197e63d487
+
+From f467ad1add2ab6e381e0e458f026df197e63d487 Mon Sep 17 00:00:00 2001
+From: Rui Ueyama 
+Date: Wed, 9 Aug 2023 11:40:09 +0900
+Subject: [PATCH] Create a symbol version dependency to GLIBC_ABI_DT_RELR
+
+Fixes https://github.com/rui314/mold/issues/653
+---
+ elf/cmdline.cc |  2 ++
+ elf/mold.h |  1 +
+ elf/output-chunks.cc   | 44 +-
+ test/elf/z-pack-relative-relocs.sh | 16 +++
+ 4 files changed, 56 insertions(+), 7 deletions(-)
+ create mode 100755 test/elf/z-pack-relative-relocs.sh
+
+diff --git a/elf/cmdline.cc b/elf/cmdline.cc
+index c568ce086..82a0e6869 100644
+--- a/elf/cmdline.cc
 b/elf/cmdline.cc
+@@ -875,8 +875,10 @@ std::vector 
parse_nonpositional_args(Context ) {
+   ctx.arg.z_nodefaultlib = true;
+ } else if (read_z_flag("pack-relative-relocs")) {
+   ctx.arg.pack_dyn_relocs_relr = true;
++  ctx.arg.z_pack_relative_relocs = true;
+ } else if (read_z_flag("nopack-relative-relocs")) {
+   ctx.arg.pack_dyn_relocs_relr = false;
++  ctx.arg.z_pack_relative_relocs = false;
+ } else if (read_z_flag("separate-loadable-segments")) {
+   z_separate_code = SEPARATE_LOADABLE_SEGMENTS;
+ } else if (read_z_flag("separate-code")) {
+diff --git a/elf/mold.h b/elf/mold.h
+index e5532211c..3a027f1e9 100644
+--- a/elf/mold.h
 b/elf/mold.h
+@@ -1831,6 +1831,7 @@ struct Context {
+ bool z_nodefaultlib = false;
+ bool z_now = false;
+ bool z_origin = false;
++bool z_pack_relative_relocs = false;
+ bool z_relro = true;
+ bool z_sectionheader = true;
+ bool z_shstk = false;
+diff --git a/elf/output-chunks.cc b/elf/output-chunks.cc
+index 726a4da2b..3896a2991 100644
+--- a/elf/output-chunks.cc
 b/elf/output-chunks.cc
+@@ -2373,12 +2373,13 @@ void VerneedSection::construct(Context ) {
+std::tuple(((SharedFile *)b->file)->soname, b->ver_idx);
+   });
+ 
+-  // Resize of .gnu.version
++  // Resize .gnu.version
+   ctx.versym->contents.resize(ctx.dynsym->symbols.size(), 1);
+   ctx.versym->contents[0] = 0;
+ 
+   // Allocate a large enough buffer for .gnu.version_r.
+-  contents.resize((sizeof(ElfVerneed) + sizeof(ElfVernaux)) * 
syms.size());
++  contents.resize((sizeof(ElfVerneed) + sizeof(ElfVernaux)) *
++  (syms.size() + 1));
+ 
+   // Fill .gnu.version_r.
+   u8 *buf = (u8 *)[0];
+@@ -2394,14 +2395,14 @@ void VerneedSection::construct(Context ) {
+   verneed->vn_next = ptr - (u8 *)verneed;
+ 
+ verneed = (ElfVerneed *)ptr;
+-ptr += sizeof(*verneed);
++ptr += sizeof(ElfVerneed);
+ verneed->vn_version = 1;
+ verneed->vn_file = ctx.dynstr->find_string(((SharedFile 
*)file)->soname);
+ verneed->vn_aux = sizeof(ElfVerneed);
+ aux = nullptr;
+   };
+ 
+-  auto add_entry = [&](Symbol *sym) {
++  auto add_entry = [&](std::string_view verstr) {
+ verneed->vn_cnt++;
+ 
+ if (aux)
+@@ -2409,23 +2410,52 @@ void VerneedSection::construct(Context ) {
+ aux = (ElfVernaux *)ptr;
+ ptr += sizeof(*aux);
+ 
+-std::string_view verstr = sym->get_version();
+ aux->vna_hash = elf_hash(verstr);
+ aux->vna_other = ++veridx;
+ aux->vna_name = ctx.dynstr->add_string(verstr);
+   };
+ 
++  // Create version entries.
+   for (i64 i = 0; i < syms.size(); i++) {
+ if (i == 0 || syms[i - 1]->file != syms[i]->file) {
+   start_group(syms[i]->file);
+-  add_entry(syms[i]);
++  add_entry(syms[i]->get_version());
+ } else if (syms[i - 1]->ver_idx != syms[i]->ver_idx) {
+-  add_entry(syms[i]);
++  add_entry(syms[i]->get_version());
+ }
+ 
+ ctx.versym->contents[syms[i]->get_dynsym_idx(ctx)] = veridx;
+   }
+ 
++  if (ctx.arg.z_pack_relative_relocs) {
++// If `-z pack-relative-relocs` is specified, we'll create a .relr.dyn
++// section and store base relocation records to 

[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/files/, sys-devel/mold/

2023-07-28 Thread Sam James
commit: 11f5aee9517614ad79d5bf9aae5d9e7a165ac6ab
Author: Sam James  gentoo  org>
AuthorDate: Sat Jul 29 04:28:38 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jul 29 04:28:38 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11f5aee9

sys-devel/mold: backport musl test fix

Signed-off-by: Sam James  gentoo.org>

 .../mold/files/mold-2.0.0-reloc-test-fix.patch | 58 ++
 sys-devel/mold/mold-2.0.0-r1.ebuild| 93 ++
 2 files changed, 151 insertions(+)

diff --git a/sys-devel/mold/files/mold-2.0.0-reloc-test-fix.patch 
b/sys-devel/mold/files/mold-2.0.0-reloc-test-fix.patch
new file mode 100644
index ..8e6e04f5d535
--- /dev/null
+++ b/sys-devel/mold/files/mold-2.0.0-reloc-test-fix.patch
@@ -0,0 +1,58 @@
+https://github.com/rui314/mold/issues/1067
+https://github.com/rui314/mold/commit/1582b720d58df61bc4c0ae39fa269e3b250b94df
+
+From 1582b720d58df61bc4c0ae39fa269e3b250b94df Mon Sep 17 00:00:00 2001
+From: Rui Ueyama 
+Date: Fri, 28 Jul 2023 14:58:57 +0900
+Subject: [PATCH] Weak undefs should not keep DSOs alive
+
+Fixes https://github.com/rui314/mold/issues/1067
+--- a/elf/input-files.cc
 b/elf/input-files.cc
+@@ -1396,7 +1396,8 @@ SharedFile::mark_live_objects(Context ,
+ if (sym.is_traced)
+   print_trace_symbol(ctx, *this, esym, sym);
+ 
+-if (esym.is_undef() && sym.file && !sym.file->is_alive.test_and_set()) {
++if (esym.is_undef() && !esym.is_weak() && sym.file &&
++!sym.file->is_alive.test_and_set()) {
+   feeder(sym.file);
+ 
+   if (sym.is_traced)
+--- /dev/null
 b/test/elf/as-needed-dso2.sh
+@@ -0,0 +1,33 @@
++#!/bin/bash
++. $(dirname $0)/common.inc
++
++cat < $t/log
++! grep libfoo.so $t/log || false
++grep -q libbar.so $t/log
+

diff --git a/sys-devel/mold/mold-2.0.0-r1.ebuild 
b/sys-devel/mold/mold-2.0.0-r1.ebuild
new file mode 100644
index ..6d863f669627
--- /dev/null
+++ b/sys-devel/mold/mold-2.0.0-r1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 2021-2023 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} ==  ]] ; 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 ~arm64 ~ppc64 ~riscv ~x86"
+fi
+
+# mold (MIT)
+#  - xxhash (BSD-2)
+LICENSE="MIT BSD-2"
+SLOT="0"
+
+RDEPEND="
+   app-arch/zstd:=
+   >=dev-cpp/tbb-2021.7.0-r1:=
+   sys-libs/zlib
+   !kernel_Darwin? (
+   >=dev-libs/mimalloc-2:=
+   dev-libs/openssl:=
+   )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+   "${FILESDIR}"/${P}-reloc-test-fix.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_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 ../../../usr/bin/${PN} /usr/libexec/${PN}/ld
+}



[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2023-07-27 Thread Sam James
commit: 4b46d7c5033a6000ff28e8811a4255efdf03f95c
Author: Sam James  gentoo  org>
AuthorDate: Thu Jul 27 07:29:51 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jul 27 07:29:51 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b46d7c5

sys-devel/mold: add 2.0.0

Signed-off-by: Sam James  gentoo.org>

 sys-devel/mold/Manifest| 1 +
 sys-devel/mold/{mold-.ebuild => mold-2.0.0.ebuild} | 6 +++---
 sys-devel/mold/mold-.ebuild| 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/sys-devel/mold/Manifest b/sys-devel/mold/Manifest
index 331edf201d83..45952667e42c 100644
--- a/sys-devel/mold/Manifest
+++ b/sys-devel/mold/Manifest
@@ -1,2 +1,3 @@
 DIST mold-1.10.1.tar.gz 8173701 BLAKE2B 
142b4ec6297f1d4eb7576d16603a214244216592df7320639da3fce32890fc3d13e681dcb79ed23e4c0c7dba1f97eb10c622052c67787b6699925ae67ddb1d15
 SHA512 
b9df5ddc3a3a022523506638309373c3440128f3c702a7db69c44c180177148e92fbf73347be0c4e0e890395cfb2a5b12d2650ee267f9f58212ccfa981519bbf
 DIST mold-1.11.0.tar.gz 8210923 BLAKE2B 
b3854a14a956dd568625fc28c96636e7cadf81b9a93954601b03e249db0aedf726a5a1f24c0758c8189a936501ebb778b472ee6e958fe9f43cb3c3093b2dda2a
 SHA512 
a9068600dd2db757552cce027f358c0b9e6af0941b92f81c1e99e2dde674bd06cc3533d432258e42a2197d9b3f8e7bb263de281928357a79e4fb17fb19719bc0
+DIST mold-2.0.0.tar.gz 9205927 BLAKE2B 
f80c72c58f4618a74390417fdf90f816810350baf1ac74d21294f5ffba7ee263807175be531c9db77209bd05a31ad11fd84d4aeb03fb057cefac7575f71612d6
 SHA512 
11c3d1e07fe4fcc28cff58b8e432526e4604aa55b49fa47c9495e439206fb9f6a1686b1c5bd2dc907ffd7fe62ac1c72317619fc8a5d7caaa5c327de585f16827

diff --git a/sys-devel/mold/mold-.ebuild b/sys-devel/mold/mold-2.0.0.ebuild
similarity index 96%
copy from sys-devel/mold/mold-.ebuild
copy to sys-devel/mold/mold-2.0.0.ebuild
index ea88934048d6..b355518cedf4 100644
--- a/sys-devel/mold/mold-.ebuild
+++ b/sys-devel/mold/mold-2.0.0.ebuild
@@ -12,12 +12,12 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://github.com/rui314/mold/archive/refs/tags/v${PV}.tar.gz 
-> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
+   KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 fi
 
-# mold (AGPL-3)
+# mold (MIT)
 #  - xxhash (BSD-2)
-LICENSE="AGPL-3 BSD-2"
+LICENSE="MIT BSD-2"
 SLOT="0"
 
 RDEPEND="

diff --git a/sys-devel/mold/mold-.ebuild b/sys-devel/mold/mold-.ebuild
index ea88934048d6..b355518cedf4 100644
--- a/sys-devel/mold/mold-.ebuild
+++ b/sys-devel/mold/mold-.ebuild
@@ -12,12 +12,12 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://github.com/rui314/mold/archive/refs/tags/v${PV}.tar.gz 
-> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
+   KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 fi
 
-# mold (AGPL-3)
+# mold (MIT)
 #  - xxhash (BSD-2)
-LICENSE="AGPL-3 BSD-2"
+LICENSE="MIT BSD-2"
 SLOT="0"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2023-04-25 Thread Arthur Zamarin
commit: fb210e121aac477e5fa19ac38818ed28f9190f49
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Tue Apr 25 14:02:24 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue Apr 25 14:02:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb210e12

sys-devel/mold: Keyword 1.11.0 arm64, #905072

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-devel/mold/mold-1.11.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/mold/mold-1.11.0.ebuild 
b/sys-devel/mold/mold-1.11.0.ebuild
index a574dbeb3b3a..4ce10d6ee43c 100644
--- a/sys-devel/mold/mold-1.11.0.ebuild
+++ b/sys-devel/mold/mold-1.11.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://github.com/rui314/mold/archive/refs/tags/v${PV}.tar.gz 
-> ${P}.tar.gz"
-   KEYWORDS="amd64 ~ppc64 ~riscv ~x86"
+   KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 fi
 
 # mold (AGPL-3)



[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2023-04-19 Thread Sam James
commit: 20aba924ef7cd860471978dc5cfa040277dca829
Author: Sam James  gentoo  org>
AuthorDate: Wed Apr 19 06:26:18 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Apr 19 06:26:25 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20aba924

sys-devel/mold: Stabilize 1.11.0 amd64, #904548

Signed-off-by: Sam James  gentoo.org>

 sys-devel/mold/mold-1.11.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/mold/mold-1.11.0.ebuild 
b/sys-devel/mold/mold-1.11.0.ebuild
index ea88934048d6..a574dbeb3b3a 100644
--- a/sys-devel/mold/mold-1.11.0.ebuild
+++ b/sys-devel/mold/mold-1.11.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://github.com/rui314/mold/archive/refs/tags/v${PV}.tar.gz 
-> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
+   KEYWORDS="amd64 ~ppc64 ~riscv ~x86"
 fi
 
 # mold (AGPL-3)



[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2023-03-16 Thread Sam James
commit: 99d8939ecb4770edf31e1b7d9036ea5f3882aaf2
Author: Sam James  gentoo  org>
AuthorDate: Thu Mar 16 23:38:34 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Mar 16 23:50:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99d8939e

sys-devel/mold: drop 1.8.0-r1, 1.9.0

Signed-off-by: Sam James  gentoo.org>

 sys-devel/mold/Manifest |  2 -
 sys-devel/mold/mold-1.8.0-r1.ebuild | 89 -
 sys-devel/mold/mold-1.9.0.ebuild| 89 -
 3 files changed, 180 deletions(-)

diff --git a/sys-devel/mold/Manifest b/sys-devel/mold/Manifest
index 9735bd00497b..8075830bf769 100644
--- a/sys-devel/mold/Manifest
+++ b/sys-devel/mold/Manifest
@@ -1,3 +1 @@
 DIST mold-1.10.1.tar.gz 8173701 BLAKE2B 
142b4ec6297f1d4eb7576d16603a214244216592df7320639da3fce32890fc3d13e681dcb79ed23e4c0c7dba1f97eb10c622052c67787b6699925ae67ddb1d15
 SHA512 
b9df5ddc3a3a022523506638309373c3440128f3c702a7db69c44c180177148e92fbf73347be0c4e0e890395cfb2a5b12d2650ee267f9f58212ccfa981519bbf
-DIST mold-1.8.0.tar.gz 8155820 BLAKE2B 
cd4285953ec56fa437d32c74b928617a50508c0b947dd0c0a3fac6813d7b929d9499f24aa2641faab78d5e81fbced48d734389c61313d752f509d25d2e1f9c61
 SHA512 
923158563c7abd39c7111e3871a90c7f6f17e0b2412c5de0c9924f3fb55d7fe57db4a83d8a20c3d4966b7b117d1c95cf4a59f63d5076db422b9aa5c3485fd7f8
-DIST mold-1.9.0.tar.gz 8163212 BLAKE2B 
09ce66e4214c184ea2f36720bc0f839f77ff2a708d56a5767d29758d62310eaf1193394d581c4352404958052c29c0cbc55a4826d10285beda50afb20bd51c80
 SHA512 
c1c45bced963d4f7c9b67905177157d6f76c518b234fe3eefa2a9ba6c35a08dd6659e64b7939744355ebcd72ae343ef0249ef6a0c80b4d77b1e69e327eb3ba19

diff --git a/sys-devel/mold/mold-1.8.0-r1.ebuild 
b/sys-devel/mold/mold-1.8.0-r1.ebuild
deleted file mode 100644
index 11b57176b2ba..
--- a/sys-devel/mold/mold-1.8.0-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 2021-2023 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} ==  ]] ; 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 ~riscv ~x86"
-fi
-
-# mold (AGPL-3)
-#  - xxhash (BSD-2)
-LICENSE="AGPL-3 BSD-2"
-SLOT="0"
-
-RDEPEND="
-   app-arch/zstd:=
-   >=dev-cpp/tbb-2021.7.0-r1:=
-   sys-libs/zlib
-   !kernel_Darwin? (
-   >=dev-libs/mimalloc-2:=
-   dev-libs/openssl:=
-   )
-"
-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_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 ../../../usr/bin/${PN} /usr/libexec/${PN}/ld
-}

diff --git a/sys-devel/mold/mold-1.9.0.ebuild b/sys-devel/mold/mold-1.9.0.ebuild
deleted file mode 100644
index 8063ade34f39..
--- a/sys-devel/mold/mold-1.9.0.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake toolchain-funcs
-
-DESCRIPTION="A Modern Linker"

[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2023-03-16 Thread Sam James
commit: 51813aa3bbc2dda40272c2a4bfc40b9ebcc7465e
Author: Sam James  gentoo  org>
AuthorDate: Thu Mar 16 23:45:13 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Mar 16 23:50:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51813aa3

sys-devel/mold: add 1.11.0

Signed-off-by: Sam James  gentoo.org>

 sys-devel/mold/Manifest   |  1 +
 sys-devel/mold/mold-1.11.0.ebuild | 89 +++
 2 files changed, 90 insertions(+)

diff --git a/sys-devel/mold/Manifest b/sys-devel/mold/Manifest
index 8075830bf769..331edf201d83 100644
--- a/sys-devel/mold/Manifest
+++ b/sys-devel/mold/Manifest
@@ -1 +1,2 @@
 DIST mold-1.10.1.tar.gz 8173701 BLAKE2B 
142b4ec6297f1d4eb7576d16603a214244216592df7320639da3fce32890fc3d13e681dcb79ed23e4c0c7dba1f97eb10c622052c67787b6699925ae67ddb1d15
 SHA512 
b9df5ddc3a3a022523506638309373c3440128f3c702a7db69c44c180177148e92fbf73347be0c4e0e890395cfb2a5b12d2650ee267f9f58212ccfa981519bbf
+DIST mold-1.11.0.tar.gz 8210923 BLAKE2B 
b3854a14a956dd568625fc28c96636e7cadf81b9a93954601b03e249db0aedf726a5a1f24c0758c8189a936501ebb778b472ee6e958fe9f43cb3c3093b2dda2a
 SHA512 
a9068600dd2db757552cce027f358c0b9e6af0941b92f81c1e99e2dde674bd06cc3533d432258e42a2197d9b3f8e7bb263de281928357a79e4fb17fb19719bc0

diff --git a/sys-devel/mold/mold-1.11.0.ebuild 
b/sys-devel/mold/mold-1.11.0.ebuild
new file mode 100644
index ..ea88934048d6
--- /dev/null
+++ b/sys-devel/mold/mold-1.11.0.ebuild
@@ -0,0 +1,89 @@
+# Copyright 2021-2023 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} ==  ]] ; 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 ~ppc64 ~riscv ~x86"
+fi
+
+# mold (AGPL-3)
+#  - xxhash (BSD-2)
+LICENSE="AGPL-3 BSD-2"
+SLOT="0"
+
+RDEPEND="
+   app-arch/zstd:=
+   >=dev-cpp/tbb-2021.7.0-r1:=
+   sys-libs/zlib
+   !kernel_Darwin? (
+   >=dev-libs/mimalloc-2:=
+   dev-libs/openssl:=
+   )
+"
+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_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 ../../../usr/bin/${PN} /usr/libexec/${PN}/ld
+}



[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2023-03-04 Thread Arthur Zamarin
commit: 6ba4b5e66ab2ad2bd5b5adc11b6ea9dad1e696f8
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar  4 11:16:14 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar  4 11:16:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ba4b5e6

sys-devel/mold: Stabilize 1.10.1 amd64, #899534

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-devel/mold/mold-1.10.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/mold/mold-1.10.1.ebuild 
b/sys-devel/mold/mold-1.10.1.ebuild
index ea88934048d6..a574dbeb3b3a 100644
--- a/sys-devel/mold/mold-1.10.1.ebuild
+++ b/sys-devel/mold/mold-1.10.1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://github.com/rui314/mold/archive/refs/tags/v${PV}.tar.gz 
-> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
+   KEYWORDS="amd64 ~ppc64 ~riscv ~x86"
 fi
 
 # mold (AGPL-3)



[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2023-01-22 Thread Georgy Yakovlev
commit: 70618cbbfc6b3790f19dde047575c56c26dea94e
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Mon Jan 23 07:17:08 2023 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Mon Jan 23 07:21:56 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70618cbb

sys-devel/mold: sync live ebuild keywords

Signed-off-by: Georgy Yakovlev  gentoo.org>

 sys-devel/mold/mold-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/mold/mold-.ebuild b/sys-devel/mold/mold-.ebuild
index 8063ade34f39..ea88934048d6 100644
--- a/sys-devel/mold/mold-.ebuild
+++ b/sys-devel/mold/mold-.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://github.com/rui314/mold/archive/refs/tags/v${PV}.tar.gz 
-> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~riscv ~x86"
+   KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
 fi
 
 # mold (AGPL-3)



[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2023-01-22 Thread Georgy Yakovlev
commit: b55a0ab6f285ed1d98ee0cb56323cf421f369e01
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Mon Jan 23 07:16:26 2023 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Mon Jan 23 07:21:56 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b55a0ab6

sys-devel/mold: keyword 1.10.1 for ~ppc64

Signed-off-by: Georgy Yakovlev  gentoo.org>

 sys-devel/mold/mold-1.10.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/mold/mold-1.10.1.ebuild 
b/sys-devel/mold/mold-1.10.1.ebuild
index 8063ade34f39..ea88934048d6 100644
--- a/sys-devel/mold/mold-1.10.1.ebuild
+++ b/sys-devel/mold/mold-1.10.1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://github.com/rui314/mold/archive/refs/tags/v${PV}.tar.gz 
-> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~riscv ~x86"
+   KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
 fi
 
 # mold (AGPL-3)



[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2023-01-21 Thread Sam James
commit: 9104c40f57f34663f82ad42275f655418fb1102e
Author: Sam James  gentoo  org>
AuthorDate: Sun Jan 22 05:18:11 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jan 22 05:18:17 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9104c40f

sys-devel/mold: add 1.10.1, drop 1.10.0

Fixes issues with GLIBCXX_ASSERTIONS.

Bug: https://github.com/rui314/mold/issues/969
Signed-off-by: Sam James  gentoo.org>

 sys-devel/mold/Manifest   | 2 +-
 sys-devel/mold/{mold-1.10.0.ebuild => mold-1.10.1.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/mold/Manifest b/sys-devel/mold/Manifest
index e564315d2077..9735bd00497b 100644
--- a/sys-devel/mold/Manifest
+++ b/sys-devel/mold/Manifest
@@ -1,3 +1,3 @@
-DIST mold-1.10.0.tar.gz 8173315 BLAKE2B 
b96df30f988982f5f612675b33f9ad8bedd253156082046b9c0c4fdb0c931ecb66baa69d767996f4583e0b9ec9c630f2677e2cfc0294818a4cd7906f33fd53c6
 SHA512 
3a275dd439383c6e868e754f64d2d4ba7fdd0e669a49e5041e2f75f30f662fd4cd6e8cca0cdd558ac5fdd43cc7d3b14ca02535eebb010cfed4c018f1eb5c84b7
+DIST mold-1.10.1.tar.gz 8173701 BLAKE2B 
142b4ec6297f1d4eb7576d16603a214244216592df7320639da3fce32890fc3d13e681dcb79ed23e4c0c7dba1f97eb10c622052c67787b6699925ae67ddb1d15
 SHA512 
b9df5ddc3a3a022523506638309373c3440128f3c702a7db69c44c180177148e92fbf73347be0c4e0e890395cfb2a5b12d2650ee267f9f58212ccfa981519bbf
 DIST mold-1.8.0.tar.gz 8155820 BLAKE2B 
cd4285953ec56fa437d32c74b928617a50508c0b947dd0c0a3fac6813d7b929d9499f24aa2641faab78d5e81fbced48d734389c61313d752f509d25d2e1f9c61
 SHA512 
923158563c7abd39c7111e3871a90c7f6f17e0b2412c5de0c9924f3fb55d7fe57db4a83d8a20c3d4966b7b117d1c95cf4a59f63d5076db422b9aa5c3485fd7f8
 DIST mold-1.9.0.tar.gz 8163212 BLAKE2B 
09ce66e4214c184ea2f36720bc0f839f77ff2a708d56a5767d29758d62310eaf1193394d581c4352404958052c29c0cbc55a4826d10285beda50afb20bd51c80
 SHA512 
c1c45bced963d4f7c9b67905177157d6f76c518b234fe3eefa2a9ba6c35a08dd6659e64b7939744355ebcd72ae343ef0249ef6a0c80b4d77b1e69e327eb3ba19

diff --git a/sys-devel/mold/mold-1.10.0.ebuild 
b/sys-devel/mold/mold-1.10.1.ebuild
similarity index 100%
rename from sys-devel/mold/mold-1.10.0.ebuild
rename to sys-devel/mold/mold-1.10.1.ebuild



[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2023-01-21 Thread Matthew Smith
commit: e04eb054665d0b92445943196c85b9f207ff60a5
Author: Matthew Smith  gentoo  org>
AuthorDate: Sat Jan 21 11:16:51 2023 +
Commit: Matthew Smith  gentoo  org>
CommitDate: Sat Jan 21 11:16:51 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e04eb054

sys-devel/mold: add 1.10.0

Signed-off-by: Matthew Smith  gentoo.org>

 sys-devel/mold/Manifest   |  1 +
 sys-devel/mold/mold-1.10.0.ebuild | 89 +++
 2 files changed, 90 insertions(+)

diff --git a/sys-devel/mold/Manifest b/sys-devel/mold/Manifest
index f5eb6040888b..e564315d2077 100644
--- a/sys-devel/mold/Manifest
+++ b/sys-devel/mold/Manifest
@@ -1,2 +1,3 @@
+DIST mold-1.10.0.tar.gz 8173315 BLAKE2B 
b96df30f988982f5f612675b33f9ad8bedd253156082046b9c0c4fdb0c931ecb66baa69d767996f4583e0b9ec9c630f2677e2cfc0294818a4cd7906f33fd53c6
 SHA512 
3a275dd439383c6e868e754f64d2d4ba7fdd0e669a49e5041e2f75f30f662fd4cd6e8cca0cdd558ac5fdd43cc7d3b14ca02535eebb010cfed4c018f1eb5c84b7
 DIST mold-1.8.0.tar.gz 8155820 BLAKE2B 
cd4285953ec56fa437d32c74b928617a50508c0b947dd0c0a3fac6813d7b929d9499f24aa2641faab78d5e81fbced48d734389c61313d752f509d25d2e1f9c61
 SHA512 
923158563c7abd39c7111e3871a90c7f6f17e0b2412c5de0c9924f3fb55d7fe57db4a83d8a20c3d4966b7b117d1c95cf4a59f63d5076db422b9aa5c3485fd7f8
 DIST mold-1.9.0.tar.gz 8163212 BLAKE2B 
09ce66e4214c184ea2f36720bc0f839f77ff2a708d56a5767d29758d62310eaf1193394d581c4352404958052c29c0cbc55a4826d10285beda50afb20bd51c80
 SHA512 
c1c45bced963d4f7c9b67905177157d6f76c518b234fe3eefa2a9ba6c35a08dd6659e64b7939744355ebcd72ae343ef0249ef6a0c80b4d77b1e69e327eb3ba19

diff --git a/sys-devel/mold/mold-1.10.0.ebuild 
b/sys-devel/mold/mold-1.10.0.ebuild
new file mode 100644
index ..8063ade34f39
--- /dev/null
+++ b/sys-devel/mold/mold-1.10.0.ebuild
@@ -0,0 +1,89 @@
+# Copyright 2021-2023 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} ==  ]] ; 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 ~riscv ~x86"
+fi
+
+# mold (AGPL-3)
+#  - xxhash (BSD-2)
+LICENSE="AGPL-3 BSD-2"
+SLOT="0"
+
+RDEPEND="
+   app-arch/zstd:=
+   >=dev-cpp/tbb-2021.7.0-r1:=
+   sys-libs/zlib
+   !kernel_Darwin? (
+   >=dev-libs/mimalloc-2:=
+   dev-libs/openssl:=
+   )
+"
+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_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 ../../../usr/bin/${PN} /usr/libexec/${PN}/ld
+}



[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2023-01-14 Thread Sam James
commit: 7d294e39202c7902a5791dee847091578a204222
Author: Sam James  gentoo  org>
AuthorDate: Sat Jan 14 23:21:20 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan 14 23:21:20 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d294e39

sys-devel/mold: add 1.9.0

Signed-off-by: Sam James  gentoo.org>

 sys-devel/mold/Manifest  |  1 +
 sys-devel/mold/mold-1.9.0.ebuild | 89 
 2 files changed, 90 insertions(+)

diff --git a/sys-devel/mold/Manifest b/sys-devel/mold/Manifest
index e01a4d3d5b75..f5eb6040888b 100644
--- a/sys-devel/mold/Manifest
+++ b/sys-devel/mold/Manifest
@@ -1 +1,2 @@
 DIST mold-1.8.0.tar.gz 8155820 BLAKE2B 
cd4285953ec56fa437d32c74b928617a50508c0b947dd0c0a3fac6813d7b929d9499f24aa2641faab78d5e81fbced48d734389c61313d752f509d25d2e1f9c61
 SHA512 
923158563c7abd39c7111e3871a90c7f6f17e0b2412c5de0c9924f3fb55d7fe57db4a83d8a20c3d4966b7b117d1c95cf4a59f63d5076db422b9aa5c3485fd7f8
+DIST mold-1.9.0.tar.gz 8163212 BLAKE2B 
09ce66e4214c184ea2f36720bc0f839f77ff2a708d56a5767d29758d62310eaf1193394d581c4352404958052c29c0cbc55a4826d10285beda50afb20bd51c80
 SHA512 
c1c45bced963d4f7c9b67905177157d6f76c518b234fe3eefa2a9ba6c35a08dd6659e64b7939744355ebcd72ae343ef0249ef6a0c80b4d77b1e69e327eb3ba19

diff --git a/sys-devel/mold/mold-1.9.0.ebuild b/sys-devel/mold/mold-1.9.0.ebuild
new file mode 100644
index ..8063ade34f39
--- /dev/null
+++ b/sys-devel/mold/mold-1.9.0.ebuild
@@ -0,0 +1,89 @@
+# Copyright 2021-2023 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} ==  ]] ; 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 ~riscv ~x86"
+fi
+
+# mold (AGPL-3)
+#  - xxhash (BSD-2)
+LICENSE="AGPL-3 BSD-2"
+SLOT="0"
+
+RDEPEND="
+   app-arch/zstd:=
+   >=dev-cpp/tbb-2021.7.0-r1:=
+   sys-libs/zlib
+   !kernel_Darwin? (
+   >=dev-libs/mimalloc-2:=
+   dev-libs/openssl:=
+   )
+"
+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_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 ../../../usr/bin/${PN} /usr/libexec/${PN}/ld
+}



[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2023-01-14 Thread Sam James
commit: 7b25ac3ac8d62629f9f088d9445e47e8d4ab1bf7
Author: Sam James  gentoo  org>
AuthorDate: Sat Jan 14 23:18:41 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan 14 23:18:41 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b25ac3a

sys-devel/mold: drop 1.7.1-r1

Signed-off-by: Sam James  gentoo.org>

 sys-devel/mold/Manifest |  1 -
 sys-devel/mold/mold-1.7.1-r1.ebuild | 89 -
 2 files changed, 90 deletions(-)

diff --git a/sys-devel/mold/Manifest b/sys-devel/mold/Manifest
index 948732ee3caf..e01a4d3d5b75 100644
--- a/sys-devel/mold/Manifest
+++ b/sys-devel/mold/Manifest
@@ -1,2 +1 @@
-DIST mold-1.7.1.tar.gz 8381932 BLAKE2B 
3355304cfe4de7aa96608e68183868debe6d7749940c507e717c5f6def3344bf1bfba8605275506bec6bab018f921c1da87515c4a8fc4f4488d37d874e70c452
 SHA512 
2e1b6203591718976a3b6c22cb9cdc4037efd101ecb520b809aaa242ee758ee24ed98d0b53012fa8423725fd9b89da94e67603af57b9de1dfb3189a096e1ae5b
 DIST mold-1.8.0.tar.gz 8155820 BLAKE2B 
cd4285953ec56fa437d32c74b928617a50508c0b947dd0c0a3fac6813d7b929d9499f24aa2641faab78d5e81fbced48d734389c61313d752f509d25d2e1f9c61
 SHA512 
923158563c7abd39c7111e3871a90c7f6f17e0b2412c5de0c9924f3fb55d7fe57db4a83d8a20c3d4966b7b117d1c95cf4a59f63d5076db422b9aa5c3485fd7f8

diff --git a/sys-devel/mold/mold-1.7.1-r1.ebuild 
b/sys-devel/mold/mold-1.7.1-r1.ebuild
deleted file mode 100644
index 8063ade34f39..
--- a/sys-devel/mold/mold-1.7.1-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 2021-2023 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} ==  ]] ; 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 ~riscv ~x86"
-fi
-
-# mold (AGPL-3)
-#  - xxhash (BSD-2)
-LICENSE="AGPL-3 BSD-2"
-SLOT="0"
-
-RDEPEND="
-   app-arch/zstd:=
-   >=dev-cpp/tbb-2021.7.0-r1:=
-   sys-libs/zlib
-   !kernel_Darwin? (
-   >=dev-libs/mimalloc-2:=
-   dev-libs/openssl:=
-   )
-"
-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_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 ../../../usr/bin/${PN} /usr/libexec/${PN}/ld
-}



[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2023-01-13 Thread Sam James
commit: c1c0aa0a9769cb070d5bdf2777f7d444677ccf48
Author: Sam James  gentoo  org>
AuthorDate: Fri Jan 13 13:50:20 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan 13 13:50:20 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1c0aa0a

sys-devel/mold: Stabilize 1.8.0-r1 amd64, #889776

Signed-off-by: Sam James  gentoo.org>

 sys-devel/mold/mold-1.8.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/mold/mold-1.8.0-r1.ebuild 
b/sys-devel/mold/mold-1.8.0-r1.ebuild
index 8063ade34f39..11b57176b2ba 100644
--- a/sys-devel/mold/mold-1.8.0-r1.ebuild
+++ b/sys-devel/mold/mold-1.8.0-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://github.com/rui314/mold/archive/refs/tags/v${PV}.tar.gz 
-> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~riscv ~x86"
+   KEYWORDS="amd64 ~riscv ~x86"
 fi
 
 # mold (AGPL-3)



[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2023-01-04 Thread Sam James
commit: 55b2421aad41d6b1fed898ae6d551fd6f7c7e3d9
Author: Sam James  gentoo  org>
AuthorDate: Thu Jan  5 00:38:12 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jan  5 00:38:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55b2421a

sys-devel/mold: depend on fixed dev-cpp/tbb for pthreads

Bug: https://bugs.gentoo.org/881161
Signed-off-by: Sam James  gentoo.org>

 sys-devel/mold/{mold-1.7.1.ebuild => mold-1.7.1-r1.ebuild} | 4 ++--
 sys-devel/mold/{mold-1.8.0.ebuild => mold-1.8.0-r1.ebuild} | 4 ++--
 sys-devel/mold/mold-.ebuild| 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sys-devel/mold/mold-1.7.1.ebuild 
b/sys-devel/mold/mold-1.7.1-r1.ebuild
similarity index 96%
rename from sys-devel/mold/mold-1.7.1.ebuild
rename to sys-devel/mold/mold-1.7.1-r1.ebuild
index 82b43f78b777..8063ade34f39 100644
--- a/sys-devel/mold/mold-1.7.1.ebuild
+++ b/sys-devel/mold/mold-1.7.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -22,7 +22,7 @@ SLOT="0"
 
 RDEPEND="
app-arch/zstd:=
-   >=dev-cpp/tbb-2021.7.0:=
+   >=dev-cpp/tbb-2021.7.0-r1:=
sys-libs/zlib
!kernel_Darwin? (
>=dev-libs/mimalloc-2:=

diff --git a/sys-devel/mold/mold-1.8.0.ebuild 
b/sys-devel/mold/mold-1.8.0-r1.ebuild
similarity index 96%
rename from sys-devel/mold/mold-1.8.0.ebuild
rename to sys-devel/mold/mold-1.8.0-r1.ebuild
index 82b43f78b777..8063ade34f39 100644
--- a/sys-devel/mold/mold-1.8.0.ebuild
+++ b/sys-devel/mold/mold-1.8.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -22,7 +22,7 @@ SLOT="0"
 
 RDEPEND="
app-arch/zstd:=
-   >=dev-cpp/tbb-2021.7.0:=
+   >=dev-cpp/tbb-2021.7.0-r1:=
sys-libs/zlib
!kernel_Darwin? (
>=dev-libs/mimalloc-2:=

diff --git a/sys-devel/mold/mold-.ebuild b/sys-devel/mold/mold-.ebuild
index 82b43f78b777..8063ade34f39 100644
--- a/sys-devel/mold/mold-.ebuild
+++ b/sys-devel/mold/mold-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -22,7 +22,7 @@ SLOT="0"
 
 RDEPEND="
app-arch/zstd:=
-   >=dev-cpp/tbb-2021.7.0:=
+   >=dev-cpp/tbb-2021.7.0-r1:=
sys-libs/zlib
!kernel_Darwin? (
>=dev-libs/mimalloc-2:=



[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2022-12-29 Thread Sam James
commit: 81321815097982e61b631852a821f5d35f2b7ac6
Author: Sam James  gentoo  org>
AuthorDate: Fri Dec 30 07:28:53 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Dec 30 07:31:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81321815

sys-devel/mold: add 1.8.0

Signed-off-by: Sam James  gentoo.org>

 sys-devel/mold/Manifest  |  1 +
 sys-devel/mold/mold-1.8.0.ebuild | 89 
 2 files changed, 90 insertions(+)

diff --git a/sys-devel/mold/Manifest b/sys-devel/mold/Manifest
index d00b1f11c936..948732ee3caf 100644
--- a/sys-devel/mold/Manifest
+++ b/sys-devel/mold/Manifest
@@ -1 +1,2 @@
 DIST mold-1.7.1.tar.gz 8381932 BLAKE2B 
3355304cfe4de7aa96608e68183868debe6d7749940c507e717c5f6def3344bf1bfba8605275506bec6bab018f921c1da87515c4a8fc4f4488d37d874e70c452
 SHA512 
2e1b6203591718976a3b6c22cb9cdc4037efd101ecb520b809aaa242ee758ee24ed98d0b53012fa8423725fd9b89da94e67603af57b9de1dfb3189a096e1ae5b
+DIST mold-1.8.0.tar.gz 8155820 BLAKE2B 
cd4285953ec56fa437d32c74b928617a50508c0b947dd0c0a3fac6813d7b929d9499f24aa2641faab78d5e81fbced48d734389c61313d752f509d25d2e1f9c61
 SHA512 
923158563c7abd39c7111e3871a90c7f6f17e0b2412c5de0c9924f3fb55d7fe57db4a83d8a20c3d4966b7b117d1c95cf4a59f63d5076db422b9aa5c3485fd7f8

diff --git a/sys-devel/mold/mold-1.8.0.ebuild b/sys-devel/mold/mold-1.8.0.ebuild
new file mode 100644
index ..82b43f78b777
--- /dev/null
+++ b/sys-devel/mold/mold-1.8.0.ebuild
@@ -0,0 +1,89 @@
+# Copyright 2021-2022 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} ==  ]] ; 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 ~riscv ~x86"
+fi
+
+# mold (AGPL-3)
+#  - xxhash (BSD-2)
+LICENSE="AGPL-3 BSD-2"
+SLOT="0"
+
+RDEPEND="
+   app-arch/zstd:=
+   >=dev-cpp/tbb-2021.7.0:=
+   sys-libs/zlib
+   !kernel_Darwin? (
+   >=dev-libs/mimalloc-2:=
+   dev-libs/openssl:=
+   )
+"
+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_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 ../../../usr/bin/${PN} /usr/libexec/${PN}/ld
+}



[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2022-11-18 Thread Sam James
commit: 43996918f77e95fd843b6e20d9289e288acae0b6
Author: Sam James  gentoo  org>
AuthorDate: Sat Nov 19 02:15:00 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Nov 19 03:19:12 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43996918

sys-devel/mold: add 1.7.1, drop 1.7.0

Signed-off-by: Sam James  gentoo.org>

 sys-devel/mold/Manifest | 2 +-
 sys-devel/mold/{mold-1.7.0.ebuild => mold-1.7.1.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/mold/Manifest b/sys-devel/mold/Manifest
index 7e3b567a1fa1..51dd654d8604 100644
--- a/sys-devel/mold/Manifest
+++ b/sys-devel/mold/Manifest
@@ -1,2 +1,2 @@
 DIST mold-1.6.0.tar.gz 8270834 BLAKE2B 
e9da062ab9871db35322cd516197e6e8172bee3a146ba32cde65976da2fb4cff0090ad62f06e25da9baed146c6defbd93d8704bd2156dcfb581ec247c45a2e12
 SHA512 
dcb498da95ee02a08b175861ae24f3793705671670f6f3487eebd3aab2487fd2163fc1747c9ca2fd1c3570a5f1f0bcfd7d4d91bf6a904a1ba098be6cbbe8c857
-DIST mold-1.7.0.tar.gz 8381327 BLAKE2B 
16da7dcdb6196a8ce014d37f8578e920c38bf63cc805211b2af3a2e75dbae5aa7c5c9fcc6b9ccc188716a5705aa25066517a52fc4fc91cf679e630dec018ab56
 SHA512 
9af87b85cc5dc6f46cec9b74effaee55332c789f0673c4e93367e8f6be3fbf3aaca5d9f5be6e4e47294e10cb1f7321a5a4fa28500bc7da7531bbe7424c9d8799
+DIST mold-1.7.1.tar.gz 8381932 BLAKE2B 
3355304cfe4de7aa96608e68183868debe6d7749940c507e717c5f6def3344bf1bfba8605275506bec6bab018f921c1da87515c4a8fc4f4488d37d874e70c452
 SHA512 
2e1b6203591718976a3b6c22cb9cdc4037efd101ecb520b809aaa242ee758ee24ed98d0b53012fa8423725fd9b89da94e67603af57b9de1dfb3189a096e1ae5b

diff --git a/sys-devel/mold/mold-1.7.0.ebuild b/sys-devel/mold/mold-1.7.1.ebuild
similarity index 100%
rename from sys-devel/mold/mold-1.7.0.ebuild
rename to sys-devel/mold/mold-1.7.1.ebuild



[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2022-11-15 Thread Matthew Smith
commit: 9647d2a00918924e1e098e2bbf7e3d5fc7d06075
Author: Matthew Smith  gentoo  org>
AuthorDate: Tue Nov 15 20:18:49 2022 +
Commit: Matthew Smith  gentoo  org>
CommitDate: Tue Nov 15 20:19:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9647d2a0

sys-devel/mold: update live ebuild

Signed-off-by: Matthew Smith  gentoo.org>

 sys-devel/mold/mold-.ebuild | 5 -
 1 file changed, 5 deletions(-)

diff --git a/sys-devel/mold/mold-.ebuild b/sys-devel/mold/mold-.ebuild
index 45c7fd085eb8..82b43f78b777 100644
--- a/sys-devel/mold/mold-.ebuild
+++ b/sys-devel/mold/mold-.ebuild
@@ -31,11 +31,6 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-PATCHES=(
-   # https://bugs.gentoo.org/865837
-   "${FILESDIR}"/mold-1.4.1-tbb-flags-stripping.patch
-)
-
 pkg_pretend() {
# Requires a c++20 compiler, see #831473
if [[ ${MERGE_TYPE} != binary ]]; then



[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2022-11-15 Thread Matthew Smith
commit: 59e6911a2f1ca165d67ecb98242782f6fae6bb0f
Author: Matthew Smith  gentoo  org>
AuthorDate: Tue Nov 15 20:18:30 2022 +
Commit: Matthew Smith  gentoo  org>
CommitDate: Tue Nov 15 20:19:24 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59e6911a

sys-devel/mold: add 1.7.0

Signed-off-by: Matthew Smith  gentoo.org>

 sys-devel/mold/Manifest  |  1 +
 sys-devel/mold/mold-1.7.0.ebuild | 89 
 2 files changed, 90 insertions(+)

diff --git a/sys-devel/mold/Manifest b/sys-devel/mold/Manifest
index 0b65d670e82d..7e3b567a1fa1 100644
--- a/sys-devel/mold/Manifest
+++ b/sys-devel/mold/Manifest
@@ -1 +1,2 @@
 DIST mold-1.6.0.tar.gz 8270834 BLAKE2B 
e9da062ab9871db35322cd516197e6e8172bee3a146ba32cde65976da2fb4cff0090ad62f06e25da9baed146c6defbd93d8704bd2156dcfb581ec247c45a2e12
 SHA512 
dcb498da95ee02a08b175861ae24f3793705671670f6f3487eebd3aab2487fd2163fc1747c9ca2fd1c3570a5f1f0bcfd7d4d91bf6a904a1ba098be6cbbe8c857
+DIST mold-1.7.0.tar.gz 8381327 BLAKE2B 
16da7dcdb6196a8ce014d37f8578e920c38bf63cc805211b2af3a2e75dbae5aa7c5c9fcc6b9ccc188716a5705aa25066517a52fc4fc91cf679e630dec018ab56
 SHA512 
9af87b85cc5dc6f46cec9b74effaee55332c789f0673c4e93367e8f6be3fbf3aaca5d9f5be6e4e47294e10cb1f7321a5a4fa28500bc7da7531bbe7424c9d8799

diff --git a/sys-devel/mold/mold-1.7.0.ebuild b/sys-devel/mold/mold-1.7.0.ebuild
new file mode 100644
index ..82b43f78b777
--- /dev/null
+++ b/sys-devel/mold/mold-1.7.0.ebuild
@@ -0,0 +1,89 @@
+# Copyright 2021-2022 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} ==  ]] ; 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 ~riscv ~x86"
+fi
+
+# mold (AGPL-3)
+#  - xxhash (BSD-2)
+LICENSE="AGPL-3 BSD-2"
+SLOT="0"
+
+RDEPEND="
+   app-arch/zstd:=
+   >=dev-cpp/tbb-2021.7.0:=
+   sys-libs/zlib
+   !kernel_Darwin? (
+   >=dev-libs/mimalloc-2:=
+   dev-libs/openssl:=
+   )
+"
+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_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 ../../../usr/bin/${PN} /usr/libexec/${PN}/ld
+}



[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2022-11-11 Thread Matthew Smith
commit: 675a146d9e0476478e62e8e647cc3d3bcdde8991
Author: Matthew Smith  gentoo  org>
AuthorDate: Fri Nov 11 11:36:43 2022 +
Commit: Matthew Smith  gentoo  org>
CommitDate: Fri Nov 11 11:36:43 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=675a146d

sys-devel/mold: update live ebuild

Signed-off-by: Matthew Smith  gentoo.org>

 sys-devel/mold/mold-.ebuild | 10 --
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/sys-devel/mold/mold-.ebuild b/sys-devel/mold/mold-.ebuild
index 34d7e10e3bf1..45c7fd085eb8 100644
--- a/sys-devel/mold/mold-.ebuild
+++ b/sys-devel/mold/mold-.ebuild
@@ -12,20 +12,18 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://github.com/rui314/mold/archive/refs/tags/v${PV}.tar.gz 
-> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~riscv"
+   KEYWORDS="~amd64 ~riscv ~x86"
 fi
 
 # mold (AGPL-3)
 #  - xxhash (BSD-2)
-#  - tbb (Apache-2.0)
-LICENSE="AGPL-3 Apache-2.0 BSD-2"
+LICENSE="AGPL-3 BSD-2"
 SLOT="0"
-IUSE="system-tbb"
 
 RDEPEND="
app-arch/zstd:=
+   >=dev-cpp/tbb-2021.7.0:=
sys-libs/zlib
-   system-tbb? ( >=dev-cpp/tbb-2021.4.0:= )
!kernel_Darwin? (
>=dev-libs/mimalloc-2:=
dev-libs/openssl:=
@@ -75,7 +73,7 @@ src_configure() {
-DMOLD_ENABLE_QEMU_TESTS=OFF
-DMOLD_LTO=OFF # Should be up to the user to decide this with 
CXXFLAGS.
-DMOLD_USE_SYSTEM_MIMALLOC=ON
-   -DMOLD_USE_SYSTEM_TBB=$(usex system-tbb)
+   -DMOLD_USE_SYSTEM_TBB=ON
)
cmake_src_configure
 }



[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2022-11-11 Thread Matthew Smith
commit: 7686df06a0062496207660744c9664dd4ada6cc7
Author: Matthew Smith  gentoo  org>
AuthorDate: Fri Nov 11 11:38:47 2022 +
Commit: Matthew Smith  gentoo  org>
CommitDate: Fri Nov 11 11:38:47 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7686df06

sys-devel/mold: drop 1.4.2, 1.5.1

Signed-off-by: Matthew Smith  gentoo.org>

 sys-devel/mold/Manifest  |  2 -
 sys-devel/mold/metadata.xml  |  3 --
 sys-devel/mold/mold-1.4.2.ebuild | 92 --
 sys-devel/mold/mold-1.5.1.ebuild | 96 
 4 files changed, 193 deletions(-)

diff --git a/sys-devel/mold/Manifest b/sys-devel/mold/Manifest
index 9572f81c8d17..0b65d670e82d 100644
--- a/sys-devel/mold/Manifest
+++ b/sys-devel/mold/Manifest
@@ -1,3 +1 @@
-DIST mold-1.4.2.tar.gz 6287845 BLAKE2B 
ec429f70b92c4af5be83761893028f2324fe2086fea0e9b64f1d89884c6bc8dd34e5615178ef28ff19c36d01dafc834e6f6b9a8d701d62e360ef4e0be2f065bd
 SHA512 
17f543969e53737818b0be563aee39feac672f93e0fd712827523232b64eccb4629f3994c5a90de50b5f761886669e0946a8d463663725e774eb7d352de1ced1
-DIST mold-1.5.1.tar.gz 8254552 BLAKE2B 
1a5f8099df3cf7a6008632afed2aa106a54fa0c6628302f13586884fd1a37705a2bfc9ddc395261c04d53fe9de679b5afc7e052dcfe3789b024670f44307
 SHA512 
340a45c5190ce5ba87eaa05238da7c70400bf4a2788a095935b9675593078ad76bbd95e67aa36b3ec683428724a3c6bc27c7e0a69569afce461682dc4bd16b10
 DIST mold-1.6.0.tar.gz 8270834 BLAKE2B 
e9da062ab9871db35322cd516197e6e8172bee3a146ba32cde65976da2fb4cff0090ad62f06e25da9baed146c6defbd93d8704bd2156dcfb581ec247c45a2e12
 SHA512 
dcb498da95ee02a08b175861ae24f3793705671670f6f3487eebd3aab2487fd2163fc1747c9ca2fd1c3570a5f1f0bcfd7d4d91bf6a904a1ba098be6cbbe8c857

diff --git a/sys-devel/mold/metadata.xml b/sys-devel/mold/metadata.xml
index 6841ad2ee625..f8a85299d5bb 100644
--- a/sys-devel/mold/metadata.xml
+++ b/sys-devel/mold/metadata.xml
@@ -12,7 +12,4 @@

rui314/mold

-   
-   Use dev-cpp/tbb package 
instead of vendored copy
-   
 

diff --git a/sys-devel/mold/mold-1.4.2.ebuild b/sys-devel/mold/mold-1.4.2.ebuild
deleted file mode 100644
index 1a83cf4d004e..
--- a/sys-devel/mold/mold-1.4.2.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 2021-2022 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} ==  ]] ; 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 ~riscv"
-fi
-
-# mold (AGPL-3)
-#  - xxhash (BSD-2)
-#  - tbb (Apache-2.0)
-LICENSE="AGPL-3 Apache-2.0 BSD-2"
-SLOT="0"
-IUSE="system-tbb"
-
-RDEPEND="
-   sys-libs/zlib
-   system-tbb? ( >=dev-cpp/tbb-2021.4.0:= )
-   !kernel_Darwin? (
-   >=dev-libs/mimalloc-2:=
-   dev-libs/openssl:=
-   )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-   # https://bugs.gentoo.org/865837
-   "${FILESDIR}"/mold-1.4.1-tbb-flags-stripping.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_SYSTEM_MIMALLOC=ON
-   -DMOLD_USE_SYSTEM_TBB=$(usex system-tbb)
-   )
-   cmake_src_configure
-}
-
-src_install() {
-   dobin "${BUILD_DIR}"/${PN}
-   dolib.so "${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 

[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2022-11-10 Thread Matthew Smith
commit: cb42d493187bcd84a0b37110aae09c0a519a109e
Author: Matthew Smith  gentoo  org>
AuthorDate: Thu Nov 10 09:43:01 2022 +
Commit: Matthew Smith  gentoo  org>
CommitDate: Thu Nov 10 09:44:05 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb42d493

sys-devel/mold: remove system-tbb USE flag

Latest upstream version now contains the required fixes, so it can be
reliably used instead of the vendored copy.

Bug: https://bugs.gentoo.org/866407
Signed-off-by: Matthew Smith  gentoo.org>

 sys-devel/mold/{mold-1.6.0.ebuild => mold-1.6.0-r1.ebuild} | 8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/sys-devel/mold/mold-1.6.0.ebuild 
b/sys-devel/mold/mold-1.6.0-r1.ebuild
similarity index 93%
rename from sys-devel/mold/mold-1.6.0.ebuild
rename to sys-devel/mold/mold-1.6.0-r1.ebuild
index f440beb10d38..45c7fd085eb8 100644
--- a/sys-devel/mold/mold-1.6.0.ebuild
+++ b/sys-devel/mold/mold-1.6.0-r1.ebuild
@@ -17,15 +17,13 @@ fi
 
 # mold (AGPL-3)
 #  - xxhash (BSD-2)
-#  - tbb (Apache-2.0)
-LICENSE="AGPL-3 Apache-2.0 BSD-2"
+LICENSE="AGPL-3 BSD-2"
 SLOT="0"
-IUSE="system-tbb"
 
 RDEPEND="
app-arch/zstd:=
+   >=dev-cpp/tbb-2021.7.0:=
sys-libs/zlib
-   system-tbb? ( >=dev-cpp/tbb-2021.4.0:= )
!kernel_Darwin? (
>=dev-libs/mimalloc-2:=
dev-libs/openssl:=
@@ -75,7 +73,7 @@ src_configure() {
-DMOLD_ENABLE_QEMU_TESTS=OFF
-DMOLD_LTO=OFF # Should be up to the user to decide this with 
CXXFLAGS.
-DMOLD_USE_SYSTEM_MIMALLOC=ON
-   -DMOLD_USE_SYSTEM_TBB=$(usex system-tbb)
+   -DMOLD_USE_SYSTEM_TBB=ON
)
cmake_src_configure
 }



[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2022-10-27 Thread Jakov Smolić
commit: 199ee6d286dae53b58403f1d6ebf8e61eba48df2
Author: Jakov Smolić  gentoo  org>
AuthorDate: Fri Oct 28 03:40:51 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Fri Oct 28 03:40:51 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=199ee6d2

sys-devel/mold: Keyword 1.6.0 x86, #870760

Signed-off-by: Jakov Smolić  gentoo.org>

 sys-devel/mold/mold-1.6.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/mold/mold-1.6.0.ebuild b/sys-devel/mold/mold-1.6.0.ebuild
index 34d7e10e3bf1..f440beb10d38 100644
--- a/sys-devel/mold/mold-1.6.0.ebuild
+++ b/sys-devel/mold/mold-1.6.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://github.com/rui314/mold/archive/refs/tags/v${PV}.tar.gz 
-> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~riscv"
+   KEYWORDS="~amd64 ~riscv ~x86"
 fi
 
 # mold (AGPL-3)



[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2022-10-22 Thread Matthew Smith
commit: a28af19328f1b8aba3c7ce1a9d9a75b5d0f03c3d
Author: Matthew Smith  gentoo  org>
AuthorDate: Sat Oct 22 08:36:11 2022 +
Commit: Matthew Smith  gentoo  org>
CommitDate: Sat Oct 22 08:36:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a28af193

sys-devel/mold: add 1.6.0

Signed-off-by: Matthew Smith  gentoo.org>

 sys-devel/mold/Manifest  |  1 +
 sys-devel/mold/mold-1.6.0.ebuild | 96 
 2 files changed, 97 insertions(+)

diff --git a/sys-devel/mold/Manifest b/sys-devel/mold/Manifest
index 50b44976a54a..9572f81c8d17 100644
--- a/sys-devel/mold/Manifest
+++ b/sys-devel/mold/Manifest
@@ -1,2 +1,3 @@
 DIST mold-1.4.2.tar.gz 6287845 BLAKE2B 
ec429f70b92c4af5be83761893028f2324fe2086fea0e9b64f1d89884c6bc8dd34e5615178ef28ff19c36d01dafc834e6f6b9a8d701d62e360ef4e0be2f065bd
 SHA512 
17f543969e53737818b0be563aee39feac672f93e0fd712827523232b64eccb4629f3994c5a90de50b5f761886669e0946a8d463663725e774eb7d352de1ced1
 DIST mold-1.5.1.tar.gz 8254552 BLAKE2B 
1a5f8099df3cf7a6008632afed2aa106a54fa0c6628302f13586884fd1a37705a2bfc9ddc395261c04d53fe9de679b5afc7e052dcfe3789b024670f44307
 SHA512 
340a45c5190ce5ba87eaa05238da7c70400bf4a2788a095935b9675593078ad76bbd95e67aa36b3ec683428724a3c6bc27c7e0a69569afce461682dc4bd16b10
+DIST mold-1.6.0.tar.gz 8270834 BLAKE2B 
e9da062ab9871db35322cd516197e6e8172bee3a146ba32cde65976da2fb4cff0090ad62f06e25da9baed146c6defbd93d8704bd2156dcfb581ec247c45a2e12
 SHA512 
dcb498da95ee02a08b175861ae24f3793705671670f6f3487eebd3aab2487fd2163fc1747c9ca2fd1c3570a5f1f0bcfd7d4d91bf6a904a1ba098be6cbbe8c857

diff --git a/sys-devel/mold/mold-1.6.0.ebuild b/sys-devel/mold/mold-1.6.0.ebuild
new file mode 100644
index ..34d7e10e3bf1
--- /dev/null
+++ b/sys-devel/mold/mold-1.6.0.ebuild
@@ -0,0 +1,96 @@
+# Copyright 2021-2022 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} ==  ]] ; 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 ~riscv"
+fi
+
+# mold (AGPL-3)
+#  - xxhash (BSD-2)
+#  - tbb (Apache-2.0)
+LICENSE="AGPL-3 Apache-2.0 BSD-2"
+SLOT="0"
+IUSE="system-tbb"
+
+RDEPEND="
+   app-arch/zstd:=
+   sys-libs/zlib
+   system-tbb? ( >=dev-cpp/tbb-2021.4.0:= )
+   !kernel_Darwin? (
+   >=dev-libs/mimalloc-2:=
+   dev-libs/openssl:=
+   )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+   # https://bugs.gentoo.org/865837
+   "${FILESDIR}"/mold-1.4.1-tbb-flags-stripping.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_SYSTEM_MIMALLOC=ON
+   -DMOLD_USE_SYSTEM_TBB=$(usex system-tbb)
+   )
+   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 ../../../usr/bin/${PN} /usr/libexec/${PN}/ld
+}



[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/files/

2022-10-15 Thread Conrad Kostecki
commit: 061ba141084aa969d84fe96913a1c8f6bd6b183b
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Fri Oct  7 20:27:24 2022 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sat Oct 15 19:33:41 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=061ba141

sys-devel/mold: remove unused patch

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/27688
Signed-off-by: Conrad Kostecki  gentoo.org>

 sys-devel/mold/files/mold-1.4.1-glob-tests.patch | 296 ---
 1 file changed, 296 deletions(-)

diff --git a/sys-devel/mold/files/mold-1.4.1-glob-tests.patch 
b/sys-devel/mold/files/mold-1.4.1-glob-tests.patch
deleted file mode 100644
index ad9dda565323..
--- a/sys-devel/mold/files/mold-1.4.1-glob-tests.patch
+++ /dev/null
@@ -1,296 +0,0 @@
-From 60070e0c1352a1cc6b02a0d1a30c657368a033c3 Mon Sep 17 00:00:00 2001
-From: Rui Ueyama 
-Date: Fri, 19 Aug 2022 20:05:26 +0800
-Subject: [PATCH] Simplify
-

- test/elf/CMakeLists.txt   | 265 +-
- test/macho/CMakeLists.txt | 100 +-
- 2 files changed, 6 insertions(+), 359 deletions(-)
-
-diff --git a/test/elf/CMakeLists.txt b/test/elf/CMakeLists.txt
-index 5d15d6cb..138e8205 100644
 a/test/elf/CMakeLists.txt
-+++ b/test/elf/CMakeLists.txt
-@@ -1,269 +1,12 @@
--set(MOLD_ELF_TESTS
--  absolute-symbols
--  allow-multiple-definition
--  ar-alignment
--  arm32-thumb-interwork
--  as-needed
--  as-needed-weak
--  as-needed2
--  auxiliary
--  basic
--  bno-symbolic
--  bsymbolic
--  bsymbolic-functions
--  bug178
--  build-id
--  canonical-plt
--  cmdline
--  color-diagnostics
--  comment
--  common
--  common-archive
--  common-ref
--  compress-debug-sections
--  compressed-debug-info
--  compressed-debug-info-gnu
--  copyrel
--  copyrel-protected
--  copyrel-relro
--  dead-debug-sections
--  debug-macro-section
--  default-symver
--  defsym
--  defsym2
--  demangle
--  demangle-rust
--  dependency-file
--  disable-new-dtags
--  discard
--  dso-undef
--  dt-init
--  dt-needed
--  duplicate-error
--  dynamic
--  dynamic-dt-debug
--  dynamic-linker
--  dynamic-list
--  dynamic-list2
--  dynamic-list3
--  emit-relocs
--  empty-file
--  empty-input
--  empty-version
--  emulation-deduction
--  entry
--  exception
--  exception-mcmodel-large
--  exclude-libs
--  exclude-libs2
--  exclude-libs3
--  execstack
--  execstack-if-needed
--  export-dynamic
--  export-from-exe
--  fatal-warnings
--  filler
--  filter
--  func-addr
--  gc-sections
--  gdb-index-compress-output
--  gdb-index-dwarf2
--  gdb-index-dwarf3
--  gdb-index-dwarf4
--  gdb-index-dwarf5
--  gdb-index-empty
--  glibc-2.22-bug
--  gnu-hash
--  gnu-linkonce
--  gnu-retain
--  gnu-unique
--  gnu-warning
--  hello-dynamic
--  hello-static
--  help
--  hidden-undef
--  icf
--  icf-small
--  ifunc-dso
--  ifunc-dynamic
--  ifunc-export
--  ifunc-static
--  ifunc-static-pie
--  image-base
--  incompatible-libs
--  incompatible-libs2
--  incompatible-obj
--  init
--  init-array
--  init-array-priorities
--  init-array-readonly
--  init-in-dso
--  initfirst
--  interpose
--  invalid-version-script
--  large-alignment
--  large-alignment-dso
--  link-order
--  linker-script
--  linker-script-defsym
--  linker-script2
--  linker-script3
--  linker-script4
--  lto-archive
--  lto-dso
--  lto-gcc
--  lto-llvm
--  lto-version-script
--  many-sections
--  mergeable-records
--  mergeable-strings
--  missing-but-ok
--  missing-error
--  mold-wrapper
--  mold-wrapper2
--  no-quick-exit
--  nocopyreloc
--  noinhibit-exec
--  non-canonical-plt
--  nostdlib
--  note
--  note-property
--  note2
--  now
--  oformat-binary
--  omagic
--  pack-dyn-relocs-relr
--  package-metadata
--  pie
--  plt
--  plt-dso
--  pltgot
--  preinit-array
--  print-dependencies
--  protected
--  protected-dynsym
--  push-pop-state
--  relax
--  reloc
--  reloc-overflow
--  reloc-rodata
--  reloc-zero
--  relocatable
--  relocatable-archive
--  relro
--  repro
--  require-defined
--  response-file
--  retain-symbols-file
--  reverse-sections
--  rodata-name
--  rosegment
--  rpath
--  run
--  run-clang
--  section-alignment
--  section-name
--  section-start
--  shared
--  shuffle-sections
--  shuffle-sections-seed
--  soname
--  start-lib
--  start-stop-symbol
--  static-archive
--  static-pie
--  stdout
--  strip
--  symbol-rank
--  symbol-version
--  symbol-version2
--  symbol-version3
--  symtab
--  symtab-dso
--  symtab-section-symbols
--  synthetic-symbols
--  sysroot
--  sysroot-linker-script
--  sysroot2
--  thin-archive
--  thread-count
--  tls-common
--  tls-dso
--  tls-gd
--  tls-gd-mcmodel-large
--  tls-gd-noplt
--  tls-gd2
--  tls-ie
--  tls-large-tbss
--  tls-ld
--  tls-ld-mcmodel-large
--  tls-ld-noplt
--  tls-le
--  tls-module-base
--  tls-nopic
--  tls-pic
--  tlsdesc
--  tlsdesc-import
--  tlsdesc-static
--  trace
--  trace-symbol
--  undefined
--  unique
--  

[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2022-09-30 Thread Matthew Smith
commit: dda4a925b2a6f8361ae19403afc15966d33fda55
Author: Matthew Smith  gentoo  org>
AuthorDate: Fri Sep 30 08:20:13 2022 +
Commit: Matthew Smith  gentoo  org>
CommitDate: Fri Sep 30 08:20:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dda4a925

sys-devel/mold: update live ebuild

Signed-off-by: Matthew Smith  gentoo.org>

 sys-devel/mold/mold-.ebuild | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/sys-devel/mold/mold-.ebuild b/sys-devel/mold/mold-.ebuild
index 1a83cf4d004e..34d7e10e3bf1 100644
--- a/sys-devel/mold/mold-.ebuild
+++ b/sys-devel/mold/mold-.ebuild
@@ -23,6 +23,7 @@ SLOT="0"
 IUSE="system-tbb"
 
 RDEPEND="
+   app-arch/zstd:=
sys-libs/zlib
system-tbb? ( >=dev-cpp/tbb-2021.4.0:= )
!kernel_Darwin? (
@@ -81,7 +82,10 @@ src_configure() {
 
 src_install() {
dobin "${BUILD_DIR}"/${PN}
-   dolib.so "${BUILD_DIR}"/${PN}-wrapper.so
+
+   # 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



[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/files/

2022-09-30 Thread Matthew Smith
commit: a16af49612406ad7be6f1eecf077939f962988b6
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Wed Sep 14 06:45:30 2022 +
Commit: Matthew Smith  gentoo  org>
CommitDate: Fri Sep 30 08:09:29 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a16af496

sys-devel/mold: remove unused patches

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Portage 3.0.35 / pkgdev 0.2.1 / pkgcheck 0.10.14
Closes: https://github.com/gentoo/gentoo/pull/27244
Signed-off-by: Matthew Smith  gentoo.org>

 .../mold/files/mold-1.2.1-install-nopython.patch   | 34 --
 .../mold/files/mold-1.3.0-openssl-pkgconfig.patch  | 28 --
 .../mold/files/mold-1.3.1-fix-riscv-set32.patch| 25 
 3 files changed, 87 deletions(-)

diff --git a/sys-devel/mold/files/mold-1.2.1-install-nopython.patch 
b/sys-devel/mold/files/mold-1.2.1-install-nopython.patch
deleted file mode 100644
index 661d3dcf392f..
--- a/sys-devel/mold/files/mold-1.2.1-install-nopython.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 4fb6d4208cfb20bad4a3491a18e78409b5a8183f Mon Sep 17 00:00:00 2001
-From: Matthew Smith 
-Date: Sat, 30 Apr 2022 07:42:50 +0100
-Subject: [PATCH] Don't invoke Python to create libexec/mold/ld symlink
-
-Reverts commits 8073a92614fb59f59570031badab5dd4bc3b4f7f and
-5803c3c200f301adc3abdb66df16d3d669712d70.
-
-Bug #841575

- Makefile | 7 +--
- 1 file changed, 1 insertion(+), 6 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index d1abc850..10e053a9 100644
 a/Makefile
-+++ b/Makefile
-@@ -204,12 +204,7 @@ install: all
-   $(STRIP) $D$(LIBDIR)/mold/mold-wrapper.so
- 
-   $(INSTALL) -d $D$(LIBEXECDIR)/mold
--
--# We want to make a symblink with a relative path, so that users can
--# move the entire directory to other place without breaking the reference.
--# GNU ln supports `--relative` to do that, but that's not supported by
--# non-GNU systems. So we use Python to compute a relative path.
--  ln -sf `python3 -c "import os.path; 
print(os.path.relpath('$(BINDIR)/mold', '$(LIBEXECDIR)/mold'))"` 
$D$(LIBEXECDIR)/mold/ld
-+  ln -sf $(BINDIR)/mold $D$(LIBEXECDIR)/mold/ld
- 
-   $(INSTALL) -d $D$(MANDIR)/man1
-   $(INSTALL_DATA) docs/mold.1 $D$(MANDIR)/man1
--- 
-2.35.3
-

diff --git a/sys-devel/mold/files/mold-1.3.0-openssl-pkgconfig.patch 
b/sys-devel/mold/files/mold-1.3.0-openssl-pkgconfig.patch
deleted file mode 100644
index d2ed0af47b41..
--- a/sys-devel/mold/files/mold-1.3.0-openssl-pkgconfig.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From a4fde946f49cddf4f7c1eceb3b86ca38375cec1d Mon Sep 17 00:00:00 2001
-From: Matthew Smith 
-Date: Sun, 26 Jun 2022 13:44:36 +0100
-Subject: [PATCH] Revert "Do not use pkg-config"
-
-This reverts commit 4ef90d4316bbba3a4b8902e38bf5f68171cc6ab7.
 a/Makefile
-+++ b/Makefile
-@@ -18,6 +18,9 @@ ifeq ($(origin CXX), default)
-   CXX = c++
- endif
- 
-+# Allow overriding pkg-config binary
-+PKG_CONFIG = pkg-config
-+
- # If you want to keep symbols in the installed binary, run make with
- # `STRIP=true` to run /bin/true instead of the strip command.
- STRIP = strip
-@@ -100,7 +103,8 @@ ifeq ($(OS), Darwin)
- endif
- 
- ifeq ($(NEEDS_LIBCRYPTO), 1)
--  MOLD_LDFLAGS += -lcrypto
-+  MOLD_CXXFLAGS += $(shell $(PKG_CONFIG) --cflags-only-I openssl)
-+  MOLD_LDFLAGS += $(shell $(PKG_CONFIG) --libs-only-L openssl) -lcrypto
- endif
- 
- # '-latomic' flag is needed building on riscv64 system.

diff --git a/sys-devel/mold/files/mold-1.3.1-fix-riscv-set32.patch 
b/sys-devel/mold/files/mold-1.3.1-fix-riscv-set32.patch
deleted file mode 100644
index 5613d8ddc003..
--- a/sys-devel/mold/files/mold-1.3.1-fix-riscv-set32.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From https://github.com/rui314/mold/pull/590
-From 68bd00caa7c7946f380f72a5dd263e7c1d436e9f Mon Sep 17 00:00:00 2001
-From: Alex Fan 
-Date: Thu, 28 Jul 2022 14:04:21 +1000
-Subject: [PATCH] [ELF][RISCV] add missing R_RISCV_SET32 in EhFrameSection
-
-Signed-off-by: Alex Fan 

- elf/arch-riscv64.cc | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/elf/arch-riscv64.cc b/elf/arch-riscv64.cc
-index 8761c6ac..0c589118 100644
 a/elf/arch-riscv64.cc
-+++ b/elf/arch-riscv64.cc
-@@ -183,6 +183,9 @@ void EhFrameSection::apply_reloc(Context , const 
ElfRel ,
-   case R_RISCV_SET16:
- *(ul16 *)loc = val;
- return;
-+  case R_RISCV_SET32:
-+*(ul32 *)loc = val;
-+return;
-   case R_RISCV_32_PCREL:
- *(ul32 *)loc = val - this->shdr.sh_addr - offset;
- return;



[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2022-09-30 Thread Matthew Smith
commit: d342b58bf97fcc7f55cd6c0c4c9adea12a65d7ea
Author: Matthew Smith  gentoo  org>
AuthorDate: Fri Sep 30 08:19:20 2022 +
Commit: Matthew Smith  gentoo  org>
CommitDate: Fri Sep 30 08:19:20 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d342b58b

sys-devel/mold: add 1.5.1

- Fix mold wrapper
- Now depends on zstd

Closes: https://github.com/gentoo/gentoo/pull/27436
Closes: https://bugs.gentoo.org/872773
Thanks-to: YamaD  dyama.net>
Signed-off-by: Matthew Smith  gentoo.org>

 sys-devel/mold/Manifest  |  1 +
 sys-devel/mold/mold-1.5.1.ebuild | 96 
 2 files changed, 97 insertions(+)

diff --git a/sys-devel/mold/Manifest b/sys-devel/mold/Manifest
index 60a571295ca5..50b44976a54a 100644
--- a/sys-devel/mold/Manifest
+++ b/sys-devel/mold/Manifest
@@ -1 +1,2 @@
 DIST mold-1.4.2.tar.gz 6287845 BLAKE2B 
ec429f70b92c4af5be83761893028f2324fe2086fea0e9b64f1d89884c6bc8dd34e5615178ef28ff19c36d01dafc834e6f6b9a8d701d62e360ef4e0be2f065bd
 SHA512 
17f543969e53737818b0be563aee39feac672f93e0fd712827523232b64eccb4629f3994c5a90de50b5f761886669e0946a8d463663725e774eb7d352de1ced1
+DIST mold-1.5.1.tar.gz 8254552 BLAKE2B 
1a5f8099df3cf7a6008632afed2aa106a54fa0c6628302f13586884fd1a37705a2bfc9ddc395261c04d53fe9de679b5afc7e052dcfe3789b024670f44307
 SHA512 
340a45c5190ce5ba87eaa05238da7c70400bf4a2788a095935b9675593078ad76bbd95e67aa36b3ec683428724a3c6bc27c7e0a69569afce461682dc4bd16b10

diff --git a/sys-devel/mold/mold-1.5.1.ebuild b/sys-devel/mold/mold-1.5.1.ebuild
new file mode 100644
index ..34d7e10e3bf1
--- /dev/null
+++ b/sys-devel/mold/mold-1.5.1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 2021-2022 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} ==  ]] ; 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 ~riscv"
+fi
+
+# mold (AGPL-3)
+#  - xxhash (BSD-2)
+#  - tbb (Apache-2.0)
+LICENSE="AGPL-3 Apache-2.0 BSD-2"
+SLOT="0"
+IUSE="system-tbb"
+
+RDEPEND="
+   app-arch/zstd:=
+   sys-libs/zlib
+   system-tbb? ( >=dev-cpp/tbb-2021.4.0:= )
+   !kernel_Darwin? (
+   >=dev-libs/mimalloc-2:=
+   dev-libs/openssl:=
+   )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+   # https://bugs.gentoo.org/865837
+   "${FILESDIR}"/mold-1.4.1-tbb-flags-stripping.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_SYSTEM_MIMALLOC=ON
+   -DMOLD_USE_SYSTEM_TBB=$(usex system-tbb)
+   )
+   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 ../../../usr/bin/${PN} /usr/libexec/${PN}/ld
+}



[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2022-09-22 Thread Sam James
commit: 337908c505dfe3214ac2e5f7da5d334839b78641
Author: Sam James  gentoo  org>
AuthorDate: Fri Sep 23 01:30:45 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Sep 23 01:35:23 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=337908c5

sys-devel/mold: drop 1.4.1

Signed-off-by: Sam James  gentoo.org>

 sys-devel/mold/Manifest  |   1 -
 sys-devel/mold/mold-1.4.1.ebuild | 109 ---
 2 files changed, 110 deletions(-)

diff --git a/sys-devel/mold/Manifest b/sys-devel/mold/Manifest
index f0d576a1e727..60a571295ca5 100644
--- a/sys-devel/mold/Manifest
+++ b/sys-devel/mold/Manifest
@@ -1,2 +1 @@
-DIST mold-1.4.1.tar.gz 6280266 BLAKE2B 
60d0a876e0bcc8f644e4b6fffe0de14299bf2bd6e382869c87761d725dca6efa874cac37aaf94ad85038c5a24521ed3582782be943236ab81c2e4b66e6002f5e
 SHA512 
304caf4e9d9b24170a9442a84036790407bd02609a5d07c31e5f0f6285128099cbc962571804636a5da55afda59b447c12218f9e4d402fbfa55ebc354814bdda
 DIST mold-1.4.2.tar.gz 6287845 BLAKE2B 
ec429f70b92c4af5be83761893028f2324fe2086fea0e9b64f1d89884c6bc8dd34e5615178ef28ff19c36d01dafc834e6f6b9a8d701d62e360ef4e0be2f065bd
 SHA512 
17f543969e53737818b0be563aee39feac672f93e0fd712827523232b64eccb4629f3994c5a90de50b5f761886669e0946a8d463663725e774eb7d352de1ced1

diff --git a/sys-devel/mold/mold-1.4.1.ebuild b/sys-devel/mold/mold-1.4.1.ebuild
deleted file mode 100644
index ff42b7ccf9f9..
--- a/sys-devel/mold/mold-1.4.1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 2021-2022 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} ==  ]] ; 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 ~riscv"
-fi
-
-# mold (AGPL-3)
-#  - xxhash (BSD-2)
-#  - tbb (Apache-2.0)
-LICENSE="AGPL-3 Apache-2.0 BSD-2"
-SLOT="0"
-IUSE="system-tbb"
-
-RDEPEND="
-   sys-libs/zlib
-   system-tbb? ( >=dev-cpp/tbb-2021.4.0:= )
-   !kernel_Darwin? (
-   >=dev-libs/mimalloc-2:=
-   dev-libs/openssl:=
-   )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-   # Allows us to rm the tests as before. Will be included in next
-   # release.
-   "${FILESDIR}"/mold-1.4.1-glob-tests.patch
-   # https://bugs.gentoo.org/865837
-   "${FILESDIR}"/mold-1.4.1-tbb-flags-stripping.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
-
-   # Don't require python. The next release has this script rewritten
-   # in CMake and so this can be dropped.
-   sed -e '/find_package(Python3/d' \
-   -e '/add_dependencies/d' \
-   -e '/UpdateGitHash/,/)/d' \
-   -i CMakeLists.txt || die
-   rm update-git-hash.py || die
-   cat 

[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2022-09-09 Thread Matthew Smith
commit: 4cfaaa2e3c0e5a3ab9afe3a356c90b4676627321
Author: Matthew Smith  gentoo  org>
AuthorDate: Fri Sep  9 09:00:20 2022 +
Commit: Matthew Smith  gentoo  org>
CommitDate: Fri Sep  9 09:46:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4cfaaa2e

sys-devel/mold: drop 1.3.1, 1.3.1-r1, 1.4.0

Signed-off-by: Matthew Smith  gentoo.org>

 sys-devel/mold/Manifest |  2 -
 sys-devel/mold/mold-1.3.1-r1.ebuild | 99 -
 sys-devel/mold/mold-1.3.1.ebuild| 97 
 sys-devel/mold/mold-1.4.0.ebuild| 97 
 4 files changed, 295 deletions(-)

diff --git a/sys-devel/mold/Manifest b/sys-devel/mold/Manifest
index de469cd16390..bcde82ba97a1 100644
--- a/sys-devel/mold/Manifest
+++ b/sys-devel/mold/Manifest
@@ -1,3 +1 @@
-DIST mold-1.3.1.tar.gz 4692379 BLAKE2B 
e34e9416cfc65d2097c4659ddc205a0c4492e50a1c6e4560006757e5c371d27410e38131f353cd0ee60b124e5fe42b0a1c50cdc3a7bed9f666596e608340e4fd
 SHA512 
f576d2fcfee5cb3bade5ba24dcdd3020a16131ce7d4c3a00c3f92b94785ed86f3f040a6f5814b9c975c4c3d90a2b8c36a8101d5fbf1bc0a4be316f4a4a6dcefa
-DIST mold-1.4.0.tar.gz 4722082 BLAKE2B 
65ac52724018f5df82ca40b287a5f3b2c3e4b6b313ef2573bfd0ed6d03054d92b9e1e52cbdad1930406cff232c4b952c33a16979968502c439b860bd782726a9
 SHA512 
7b7c4a7bac6bbc6e22372d93d94a6cb804c7017eba16b90e9bbc42b9608108c724ef55337aabdd9ce2f5244b94c8fd64311e70e18b5f8cf5f68533c2639e550d
 DIST mold-1.4.1.tar.gz 6280266 BLAKE2B 
60d0a876e0bcc8f644e4b6fffe0de14299bf2bd6e382869c87761d725dca6efa874cac37aaf94ad85038c5a24521ed3582782be943236ab81c2e4b66e6002f5e
 SHA512 
304caf4e9d9b24170a9442a84036790407bd02609a5d07c31e5f0f6285128099cbc962571804636a5da55afda59b447c12218f9e4d402fbfa55ebc354814bdda

diff --git a/sys-devel/mold/mold-1.3.1-r1.ebuild 
b/sys-devel/mold/mold-1.3.1-r1.ebuild
deleted file mode 100644
index b4a955bb2dea..
--- a/sys-devel/mold/mold-1.3.1-r1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="A Modern Linker"
-HOMEPAGE="https://github.com/rui314/mold;
-if [[ ${PV} ==  ]] ; 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 ~riscv"
-fi
-
-LICENSE="AGPL-3"
-SLOT="0"
-
-RDEPEND=">=dev-cpp/tbb-2021.4.0:=
-   sys-libs/zlib
-   !kernel_Darwin? (
-   >=dev-libs/mimalloc-2:=
-   dev-libs/openssl:=
-   )"
-# As of 1.1, xxhash is now a header-only dep, but it's now bundled :(
-# TODO: restore SYSTEM_XXHASH upstream?
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-   # Bug #841575
-   "${FILESDIR}"/${PN}-1.2.1-install-nopython.patch
-   "${FILESDIR}"/${PN}-1.3.0-openssl-pkgconfig.patch
-   # Bug #861488
-   "${FILESDIR}"/${PN}-1.3.1-fix-riscv-set32.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() {
-   default
-
-   # 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_compile() {
-   tc-export CC CXX
-
-   emake \
-   CFLAGS="${CFLAGS}" \
-   CXXFLAGS="${CXXFLAGS}" \
-   SYSTEM_TBB=1 \
-   SYSTEM_MIMALLOC=1 \
-   STRIP="true" \
-   LIBDIR="${EPREFIX}/usr/$(get_libdir)"
-}
-
-src_test() {
-   emake \
-   SYSTEM_TBB=1 \
-   SYSTEM_MIMALLOC=1 \
-   check
-}
-
-src_install() {
-   emake \
-   SYSTEM_TBB=1 \
-   SYSTEM_MIMALLOC=1 \
-   DESTDIR="${D}" \
-   PREFIX="${EPREFIX}/usr" \
-   LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-   STRIP="true" \
-   install
-}

diff --git a/sys-devel/mold/mold-1.3.1.ebuild b/sys-devel/mold/mold-1.3.1.ebuild

[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2022-09-09 Thread Matthew Smith
commit: 3fb7f7dc46c8c7703439aacf1be18eca8f99d44e
Author: Matthew Smith  gentoo  org>
AuthorDate: Fri Sep  9 09:02:07 2022 +
Commit: Matthew Smith  gentoo  org>
CommitDate: Fri Sep  9 09:47:00 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fb7f7dc

sys-devel/mold: add 1.4.2

Signed-off-by: Matthew Smith  gentoo.org>

 sys-devel/mold/Manifest  |  1 +
 sys-devel/mold/mold-1.4.2.ebuild | 92 
 2 files changed, 93 insertions(+)

diff --git a/sys-devel/mold/Manifest b/sys-devel/mold/Manifest
index bcde82ba97a1..f0d576a1e727 100644
--- a/sys-devel/mold/Manifest
+++ b/sys-devel/mold/Manifest
@@ -1 +1,2 @@
 DIST mold-1.4.1.tar.gz 6280266 BLAKE2B 
60d0a876e0bcc8f644e4b6fffe0de14299bf2bd6e382869c87761d725dca6efa874cac37aaf94ad85038c5a24521ed3582782be943236ab81c2e4b66e6002f5e
 SHA512 
304caf4e9d9b24170a9442a84036790407bd02609a5d07c31e5f0f6285128099cbc962571804636a5da55afda59b447c12218f9e4d402fbfa55ebc354814bdda
+DIST mold-1.4.2.tar.gz 6287845 BLAKE2B 
ec429f70b92c4af5be83761893028f2324fe2086fea0e9b64f1d89884c6bc8dd34e5615178ef28ff19c36d01dafc834e6f6b9a8d701d62e360ef4e0be2f065bd
 SHA512 
17f543969e53737818b0be563aee39feac672f93e0fd712827523232b64eccb4629f3994c5a90de50b5f761886669e0946a8d463663725e774eb7d352de1ced1

diff --git a/sys-devel/mold/mold-1.4.2.ebuild b/sys-devel/mold/mold-1.4.2.ebuild
new file mode 100644
index ..1a83cf4d004e
--- /dev/null
+++ b/sys-devel/mold/mold-1.4.2.ebuild
@@ -0,0 +1,92 @@
+# Copyright 2021-2022 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} ==  ]] ; 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 ~riscv"
+fi
+
+# mold (AGPL-3)
+#  - xxhash (BSD-2)
+#  - tbb (Apache-2.0)
+LICENSE="AGPL-3 Apache-2.0 BSD-2"
+SLOT="0"
+IUSE="system-tbb"
+
+RDEPEND="
+   sys-libs/zlib
+   system-tbb? ( >=dev-cpp/tbb-2021.4.0:= )
+   !kernel_Darwin? (
+   >=dev-libs/mimalloc-2:=
+   dev-libs/openssl:=
+   )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+   # https://bugs.gentoo.org/865837
+   "${FILESDIR}"/mold-1.4.1-tbb-flags-stripping.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_SYSTEM_MIMALLOC=ON
+   -DMOLD_USE_SYSTEM_TBB=$(usex system-tbb)
+   )
+   cmake_src_configure
+}
+
+src_install() {
+   dobin "${BUILD_DIR}"/${PN}
+   dolib.so "${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 ../../../usr/bin/${PN} /usr/libexec/${PN}/ld
+}



[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2022-08-26 Thread Sam James
commit: 107abf94b5055b0b1a44edcec08c95bfe10491d5
Author: Petr Vaněk  atlas  cz>
AuthorDate: Thu Aug 25 21:41:17 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Aug 26 10:46:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=107abf94

sys-devel/mold: use  tag in metadata.xml

Signed-off-by: Petr Vaněk  atlas.cz>
Signed-off-by: Sam James  gentoo.org>

 sys-devel/mold/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/mold/metadata.xml b/sys-devel/mold/metadata.xml
index 20ae5863a76b..6841ad2ee625 100644
--- a/sys-devel/mold/metadata.xml
+++ b/sys-devel/mold/metadata.xml
@@ -13,6 +13,6 @@
rui314/mold


-   Use dev-cpp/tbb package instead of 
vendored copy
+   Use dev-cpp/tbb package 
instead of vendored copy

 



[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2022-08-20 Thread Matthew Smith
commit: eaf1cdafeb5bfea797ebbad795b848f48a86a5f2
Author: Matthew Smith  gentoo  org>
AuthorDate: Sat Aug 20 08:25:05 2022 +
Commit: Matthew Smith  gentoo  org>
CommitDate: Sat Aug 20 08:26:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eaf1cdaf

sys-devel/mold: stop calling python during build

Closes: https://bugs.gentoo.org/865859
Signed-off-by: Matthew Smith  gentoo.org>

 sys-devel/mold/mold-1.4.1.ebuild | 10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/sys-devel/mold/mold-1.4.1.ebuild b/sys-devel/mold/mold-1.4.1.ebuild
index 804483084d56..ff42b7ccf9f9 100644
--- a/sys-devel/mold/mold-1.4.1.ebuild
+++ b/sys-devel/mold/mold-1.4.1.ebuild
@@ -71,9 +71,13 @@ src_prepare() {
rm test/elf/{,ifunc-}static-pie.sh || die
fi
 
-   # Don't require python
-   sed -i '/find_package(Python3/d' CMakeLists.txt || die
-   sed -i '/add_dependencies/d' CMakeLists.txt || die
+   # Don't require python. The next release has this script rewritten
+   # in CMake and so this can be dropped.
+   sed -e '/find_package(Python3/d' \
+   -e '/add_dependencies/d' \
+   -e '/UpdateGitHash/,/)/d' \
+   -i CMakeLists.txt || die
+   rm update-git-hash.py || die
cat 

[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2022-08-20 Thread Matthew Smith
commit: 4c434f4daaeb895387c4e9cb9784847ff937ff0d
Author: Matthew Smith  gentoo  org>
AuthorDate: Sat Aug 20 08:25:43 2022 +
Commit: Matthew Smith  gentoo  org>
CommitDate: Sat Aug 20 08:26:15 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c434f4d

sys-devel/mold: update live ebuild

Python script is dropped and rewritten in CMake.

Signed-off-by: Matthew Smith  gentoo.org>

 sys-devel/mold/mold-.ebuild | 10 --
 1 file changed, 10 deletions(-)

diff --git a/sys-devel/mold/mold-.ebuild b/sys-devel/mold/mold-.ebuild
index 735bfbb79a24..1a83cf4d004e 100644
--- a/sys-devel/mold/mold-.ebuild
+++ b/sys-devel/mold/mold-.ebuild
@@ -67,16 +67,6 @@ src_prepare() {
if ! has_version -d 'sys-libs/glibc[static-pie(+)]'; then
rm test/elf/{,ifunc-}static-pie.sh || die
fi
-
-   # Don't require python
-   sed -i '/find_package(Python3/d' CMakeLists.txt || die
-   sed -i '/add_dependencies/d' CMakeLists.txt || die
-   cat 

[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/, sys-devel/mold/files/

2022-08-20 Thread Matthew Smith
commit: ff754ddf643973da9cabf7778504572e6451b2e8
Author: Matthew Smith  gentoo  org>
AuthorDate: Sat Aug 20 06:35:44 2022 +
Commit: Matthew Smith  gentoo  org>
CommitDate: Sat Aug 20 06:37:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff754ddf

sys-devel/mold: fix build with gcc-12

Prevent overeager stripping of compiler flags by vendored
tbb CMake scripts.

No revbump as installed files are the same.

Closes: https://bugs.gentoo.org/865837
Signed-off-by: Matthew Smith  gentoo.org>

 .../files/mold-1.4.1-tbb-flags-stripping.patch | 28 ++
 sys-devel/mold/mold-1.4.1.ebuild   |  2 ++
 sys-devel/mold/mold-.ebuild|  5 
 3 files changed, 35 insertions(+)

diff --git a/sys-devel/mold/files/mold-1.4.1-tbb-flags-stripping.patch 
b/sys-devel/mold/files/mold-1.4.1-tbb-flags-stripping.patch
new file mode 100644
index ..58cfca04132e
--- /dev/null
+++ b/sys-devel/mold/files/mold-1.4.1-tbb-flags-stripping.patch
@@ -0,0 +1,28 @@
+https://github.com/oneapi-src/oneTBB/pull/716
+https://bugs.gentoo.org/865837
+
+From 9595b9699ae6863d1e0cf770a89728eafcaf8845 Mon Sep 17 00:00:00 2001
+From: Christoph Erhardt 
+Date: Wed, 5 Jan 2022 15:13:32 +0100
+Subject: [PATCH] Fix overeager stripping of compile flag
+
+The existing regex strips all occurrences of the given string from
+`${CMAKE_CXX_FLAGS}`, regardless of whether it is just a substring of a
+flag. For instance, `-Werror=format-security` gets truncated to
+`=format-security`.
+
+The new regex makes sure that only whole words get replaced.
+
+Signed-off-by: Christoph Erhardt 
+--- a/third-party/tbb/cmake/utils.cmake
 b/third-party/tbb/cmake/utils.cmake
+@@ -18,7 +18,7 @@ macro(tbb_remove_compile_flag flag)
+ set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY 
COMPILE_OPTIONS ${_tbb_compile_options})
+ unset(_tbb_compile_options)
+ if (CMAKE_CXX_FLAGS)
+-string(REGEX REPLACE ${flag} "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
++string(REGEX REPLACE "(^|[ \t\r\n]+)${flag}($|[ \t\r\n]+)" " " 
CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
+ endif()
+ endmacro()
+ 
+

diff --git a/sys-devel/mold/mold-1.4.1.ebuild b/sys-devel/mold/mold-1.4.1.ebuild
index 1aac8ca1098e..804483084d56 100644
--- a/sys-devel/mold/mold-1.4.1.ebuild
+++ b/sys-devel/mold/mold-1.4.1.ebuild
@@ -36,6 +36,8 @@ PATCHES=(
# Allows us to rm the tests as before. Will be included in next
# release.
"${FILESDIR}"/mold-1.4.1-glob-tests.patch
+   # https://bugs.gentoo.org/865837
+   "${FILESDIR}"/mold-1.4.1-tbb-flags-stripping.patch
 )
 
 pkg_pretend() {

diff --git a/sys-devel/mold/mold-.ebuild b/sys-devel/mold/mold-.ebuild
index b170b570b827..735bfbb79a24 100644
--- a/sys-devel/mold/mold-.ebuild
+++ b/sys-devel/mold/mold-.ebuild
@@ -32,6 +32,11 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+   # https://bugs.gentoo.org/865837
+   "${FILESDIR}"/mold-1.4.1-tbb-flags-stripping.patch
+)
+
 pkg_pretend() {
# Requires a c++20 compiler, see #831473
if [[ ${MERGE_TYPE} != binary ]]; then



[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2022-08-19 Thread Matthew Smith
commit: 3ea682897a3b3bd80ebe261170c0fec3ac04e985
Author: Matthew Smith  gentoo  org>
AuthorDate: Fri Aug 19 17:54:48 2022 +
Commit: Matthew Smith  gentoo  org>
CommitDate: Fri Aug 19 17:55:18 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ea68289

sys-devel/mold: update live ebuild

Signed-off-by: Matthew Smith  gentoo.org>

 sys-devel/mold/mold-.ebuild | 76 -
 1 file changed, 38 insertions(+), 38 deletions(-)

diff --git a/sys-devel/mold/mold-.ebuild b/sys-devel/mold/mold-.ebuild
index 2a7faac5052d..b170b570b827 100644
--- a/sys-devel/mold/mold-.ebuild
+++ b/sys-devel/mold/mold-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit toolchain-funcs
+inherit cmake toolchain-funcs
 
 DESCRIPTION="A Modern Linker"
 HOMEPAGE="https://github.com/rui314/mold;
@@ -12,28 +12,26 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://github.com/rui314/mold/archive/refs/tags/v${PV}.tar.gz 
-> ${P}.tar.gz"
-   KEYWORDS="~amd64"
+   KEYWORDS="~amd64 ~riscv"
 fi
 
-LICENSE="AGPL-3"
+# mold (AGPL-3)
+#  - xxhash (BSD-2)
+#  - tbb (Apache-2.0)
+LICENSE="AGPL-3 Apache-2.0 BSD-2"
 SLOT="0"
+IUSE="system-tbb"
 
-RDEPEND=">=dev-cpp/tbb-2021.4.0:=
+RDEPEND="
sys-libs/zlib
+   system-tbb? ( >=dev-cpp/tbb-2021.4.0:= )
!kernel_Darwin? (
>=dev-libs/mimalloc-2:=
dev-libs/openssl:=
-   )"
-# As of 1.1, xxhash is now a header-only dep, but it's now bundled :(
-# TODO: restore SYSTEM_XXHASH upstream?
+   )
+"
 DEPEND="${RDEPEND}"
 
-PATCHES=(
-   # Bug #841575
-   "${FILESDIR}"/${PN}-1.2.1-install-nopython.patch
-   "${FILESDIR}"/${PN}-1.3.0-openssl-pkgconfig.patch
-)
-
 pkg_pretend() {
# Requires a c++20 compiler, see #831473
if [[ ${MERGE_TYPE} != binary ]]; then
@@ -46,7 +44,7 @@ pkg_pretend() {
 }
 
 src_prepare() {
-   default
+   cmake_src_prepare
 
# Needs unpackaged dwarfdump
rm test/elf/{{dead,compress}-debug-sections,compressed-debug-info}.sh 
|| die
@@ -64,34 +62,36 @@ src_prepare() {
if ! has_version -d 'sys-libs/glibc[static-pie(+)]'; then
rm test/elf/{,ifunc-}static-pie.sh || die
fi
-}
-
-src_compile() {
-   tc-export CC CXX
 
-   emake \
-   CFLAGS="${CFLAGS}" \
-   CXXFLAGS="${CXXFLAGS}" \
-   SYSTEM_TBB=1 \
-   SYSTEM_MIMALLOC=1 \
-   STRIP="true" \
-   LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+   # Don't require python
+   sed -i '/find_package(Python3/d' CMakeLists.txt || die
+   sed -i '/add_dependencies/d' CMakeLists.txt || die
+   cat 

[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2022-08-08 Thread Matthew Smith
commit: d36bd811e5f74100e639ca76e5ee3fe745a373bf
Author: Matthew Smith  gentoo  org>
AuthorDate: Mon Aug  8 18:07:27 2022 +
Commit: Matthew Smith  gentoo  org>
CommitDate: Mon Aug  8 18:07:57 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d36bd811

sys-devel/mold: add 1.4.0

Signed-off-by: Matthew Smith  gentoo.org>

 sys-devel/mold/Manifest  |  1 +
 sys-devel/mold/mold-1.4.0.ebuild | 97 
 2 files changed, 98 insertions(+)

diff --git a/sys-devel/mold/Manifest b/sys-devel/mold/Manifest
index b02d9cb3a460..180c8cf53493 100644
--- a/sys-devel/mold/Manifest
+++ b/sys-devel/mold/Manifest
@@ -1 +1,2 @@
 DIST mold-1.3.1.tar.gz 4692379 BLAKE2B 
e34e9416cfc65d2097c4659ddc205a0c4492e50a1c6e4560006757e5c371d27410e38131f353cd0ee60b124e5fe42b0a1c50cdc3a7bed9f666596e608340e4fd
 SHA512 
f576d2fcfee5cb3bade5ba24dcdd3020a16131ce7d4c3a00c3f92b94785ed86f3f040a6f5814b9c975c4c3d90a2b8c36a8101d5fbf1bc0a4be316f4a4a6dcefa
+DIST mold-1.4.0.tar.gz 4722082 BLAKE2B 
65ac52724018f5df82ca40b287a5f3b2c3e4b6b313ef2573bfd0ed6d03054d92b9e1e52cbdad1930406cff232c4b952c33a16979968502c439b860bd782726a9
 SHA512 
7b7c4a7bac6bbc6e22372d93d94a6cb804c7017eba16b90e9bbc42b9608108c724ef55337aabdd9ce2f5244b94c8fd64311e70e18b5f8cf5f68533c2639e550d

diff --git a/sys-devel/mold/mold-1.4.0.ebuild b/sys-devel/mold/mold-1.4.0.ebuild
new file mode 100644
index ..53cc37505b9c
--- /dev/null
+++ b/sys-devel/mold/mold-1.4.0.ebuild
@@ -0,0 +1,97 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="A Modern Linker"
+HOMEPAGE="https://github.com/rui314/mold;
+if [[ ${PV} ==  ]] ; 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 ~riscv"
+fi
+
+LICENSE="AGPL-3"
+SLOT="0"
+
+RDEPEND=">=dev-cpp/tbb-2021.4.0:=
+   sys-libs/zlib
+   !kernel_Darwin? (
+   >=dev-libs/mimalloc-2:=
+   dev-libs/openssl:=
+   )"
+# As of 1.1, xxhash is now a header-only dep, but it's now bundled :(
+# TODO: restore SYSTEM_XXHASH upstream?
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+   # Bug #841575
+   "${FILESDIR}"/${PN}-1.2.1-install-nopython.patch
+   "${FILESDIR}"/${PN}-1.3.0-openssl-pkgconfig.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() {
+   default
+
+   # 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_compile() {
+   tc-export CC CXX
+
+   emake \
+   CFLAGS="${CFLAGS}" \
+   CXXFLAGS="${CXXFLAGS}" \
+   SYSTEM_TBB=1 \
+   SYSTEM_MIMALLOC=1 \
+   STRIP="true" \
+   LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+}
+
+src_test() {
+   emake \
+   SYSTEM_TBB=1 \
+   SYSTEM_MIMALLOC=1 \
+   check
+}
+
+src_install() {
+   emake \
+   SYSTEM_TBB=1 \
+   SYSTEM_MIMALLOC=1 \
+   DESTDIR="${D}" \
+   PREFIX="${EPREFIX}/usr" \
+   LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+   STRIP="true" \
+   install
+}



[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2022-07-28 Thread Sam James
commit: 5c0da387d334c8b82ae98afc801a49851460b3cb
Author: Han Gao  gmail  com>
AuthorDate: Thu Jul 28 09:59:46 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jul 28 10:13:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c0da387

sys-devel/mold: riscv keywording

Signed-off-by: Han Gao  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/26632
Signed-off-by: Sam James  gentoo.org>

 sys-devel/mold/mold-1.3.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/mold/mold-1.3.1.ebuild b/sys-devel/mold/mold-1.3.1.ebuild
index 2a7faac5052d..53cc37505b9c 100644
--- a/sys-devel/mold/mold-1.3.1.ebuild
+++ b/sys-devel/mold/mold-1.3.1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} ==  ]] ; then
inherit git-r3
 else
SRC_URI="https://github.com/rui314/mold/archive/refs/tags/v${PV}.tar.gz 
-> ${P}.tar.gz"
-   KEYWORDS="~amd64"
+   KEYWORDS="~amd64 ~riscv"
 fi
 
 LICENSE="AGPL-3"



[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/files/, sys-devel/mold/

2022-07-28 Thread Sam James
commit: b53e78583cc4390f7660936543b7417af040e141
Author: Han Gao  gmail  com>
AuthorDate: Thu Jul 28 09:32:30 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jul 28 10:13:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b53e7858

sys-devel/mold: fix riscv R_RISCV_SET32 in EhFrameSection

Bug: https://bugs.gentoo.org/861488
Signed-off-by: Han Gao  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 .../mold/files/mold-1.3.1-fix-riscv-set32.patch| 25 ++
 sys-devel/mold/mold-1.3.1-r1.ebuild| 99 ++
 2 files changed, 124 insertions(+)

diff --git a/sys-devel/mold/files/mold-1.3.1-fix-riscv-set32.patch 
b/sys-devel/mold/files/mold-1.3.1-fix-riscv-set32.patch
new file mode 100644
index ..5613d8ddc003
--- /dev/null
+++ b/sys-devel/mold/files/mold-1.3.1-fix-riscv-set32.patch
@@ -0,0 +1,25 @@
+From https://github.com/rui314/mold/pull/590
+From 68bd00caa7c7946f380f72a5dd263e7c1d436e9f Mon Sep 17 00:00:00 2001
+From: Alex Fan 
+Date: Thu, 28 Jul 2022 14:04:21 +1000
+Subject: [PATCH] [ELF][RISCV] add missing R_RISCV_SET32 in EhFrameSection
+
+Signed-off-by: Alex Fan 
+---
+ elf/arch-riscv64.cc | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/elf/arch-riscv64.cc b/elf/arch-riscv64.cc
+index 8761c6ac..0c589118 100644
+--- a/elf/arch-riscv64.cc
 b/elf/arch-riscv64.cc
+@@ -183,6 +183,9 @@ void EhFrameSection::apply_reloc(Context , const 
ElfRel ,
+   case R_RISCV_SET16:
+ *(ul16 *)loc = val;
+ return;
++  case R_RISCV_SET32:
++*(ul32 *)loc = val;
++return;
+   case R_RISCV_32_PCREL:
+ *(ul32 *)loc = val - this->shdr.sh_addr - offset;
+ return;

diff --git a/sys-devel/mold/mold-1.3.1-r1.ebuild 
b/sys-devel/mold/mold-1.3.1-r1.ebuild
new file mode 100644
index ..b4a955bb2dea
--- /dev/null
+++ b/sys-devel/mold/mold-1.3.1-r1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="A Modern Linker"
+HOMEPAGE="https://github.com/rui314/mold;
+if [[ ${PV} ==  ]] ; 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 ~riscv"
+fi
+
+LICENSE="AGPL-3"
+SLOT="0"
+
+RDEPEND=">=dev-cpp/tbb-2021.4.0:=
+   sys-libs/zlib
+   !kernel_Darwin? (
+   >=dev-libs/mimalloc-2:=
+   dev-libs/openssl:=
+   )"
+# As of 1.1, xxhash is now a header-only dep, but it's now bundled :(
+# TODO: restore SYSTEM_XXHASH upstream?
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+   # Bug #841575
+   "${FILESDIR}"/${PN}-1.2.1-install-nopython.patch
+   "${FILESDIR}"/${PN}-1.3.0-openssl-pkgconfig.patch
+   # Bug #861488
+   "${FILESDIR}"/${PN}-1.3.1-fix-riscv-set32.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() {
+   default
+
+   # 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_compile() {
+   tc-export CC CXX
+
+   emake \
+   CFLAGS="${CFLAGS}" \
+   CXXFLAGS="${CXXFLAGS}" \
+   SYSTEM_TBB=1 \
+   SYSTEM_MIMALLOC=1 \
+   STRIP="true" \
+   LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+}
+
+src_test() {
+   emake \
+   SYSTEM_TBB=1 \
+   SYSTEM_MIMALLOC=1 \
+   check
+}
+
+src_install() {
+   emake \
+   SYSTEM_TBB=1 \
+   SYSTEM_MIMALLOC=1 \
+   DESTDIR="${D}" \
+   PREFIX="${EPREFIX}/usr" \
+   LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+   STRIP="true" \
+   install
+}



[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2022-07-25 Thread Sam James
commit: 6a6ff99204f6d60b11c964e832c901c32b19bcc9
Author: Sam James  gentoo  org>
AuthorDate: Tue Jul 26 04:19:41 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul 26 04:25:26 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a6ff992

sys-devel/mold: drop 1.2.1-r1, 1.3.0

Signed-off-by: Sam James  gentoo.org>

 sys-devel/mold/Manifest |  2 -
 sys-devel/mold/mold-1.2.1-r1.ebuild | 95 
 sys-devel/mold/mold-1.3.0.ebuild| 97 -
 3 files changed, 194 deletions(-)

diff --git a/sys-devel/mold/Manifest b/sys-devel/mold/Manifest
index 0ca5f897179c..b02d9cb3a460 100644
--- a/sys-devel/mold/Manifest
+++ b/sys-devel/mold/Manifest
@@ -1,3 +1 @@
-DIST mold-1.2.1.tar.gz 4669615 BLAKE2B 
ba483a479d3eff0ea1dbce0da8c292b6a95c0faee2ac0f52d7be392e41d70e5ff3d7859e43fd721720bfb8331984823f2762acfd9dc51d3f5d8fd0a4865088c9
 SHA512 
fc39674b00119d09b3275ed7232356f0b25dad1a0f3a498f9db1a4835b6d4f9ea637ca9a643a05591ea895e8751d9bee43cdcb42303beb082462e76ddb42a0f1
-DIST mold-1.3.0.tar.gz 4689476 BLAKE2B 
2696f74095763ecda7407d1e677a568e0fddbaf5a3ba16dd21e998d80ff77968d77f46f981958087ada11ede181bee1f0bb8c511eede549a81f4edd7c9dc1280
 SHA512 
c9da8ece83049afcb815444c81d090a7bdead85b88898460cd94cfc83766b54793d3aa15ce7ce3bd8070a080d1241684c15ad81485ec39cfef768360c574964a
 DIST mold-1.3.1.tar.gz 4692379 BLAKE2B 
e34e9416cfc65d2097c4659ddc205a0c4492e50a1c6e4560006757e5c371d27410e38131f353cd0ee60b124e5fe42b0a1c50cdc3a7bed9f666596e608340e4fd
 SHA512 
f576d2fcfee5cb3bade5ba24dcdd3020a16131ce7d4c3a00c3f92b94785ed86f3f040a6f5814b9c975c4c3d90a2b8c36a8101d5fbf1bc0a4be316f4a4a6dcefa

diff --git a/sys-devel/mold/mold-1.2.1-r1.ebuild 
b/sys-devel/mold/mold-1.2.1-r1.ebuild
deleted file mode 100644
index 87931221e192..
--- a/sys-devel/mold/mold-1.2.1-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="A Modern Linker"
-HOMEPAGE="https://github.com/rui314/mold;
-if [[ ${PV} ==  ]] ; 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"
-fi
-
-LICENSE="AGPL-3"
-SLOT="0"
-
-RDEPEND=">=dev-cpp/tbb-2021.4.0:=
-   sys-libs/zlib
-   !kernel_Darwin? (
-   >=dev-libs/mimalloc-2:=
-   dev-libs/openssl:=
-   )"
-# As of 1.1, xxhash is now a header-only dep, but it's now bundled :(
-# TODO: restore SYSTEM_XXHASH upstream?
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-   # Bug #841575
-   "${FILESDIR}"/${PN}-1.2.1-install-nopython.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() {
-   default
-
-   # 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
-
-   # Sandbox sadness
-   rm test/elf/run.sh || die
-   sed -i 's|$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/{hello,ifunc}-static-pie.sh || die
-   fi
-}
-
-src_compile() {
-   tc-export CC CXX
-
-   emake \
-   CFLAGS="${CFLAGS}" \
-   CXXFLAGS="${CXXFLAGS}" \
-   SYSTEM_TBB=1 \
-   SYSTEM_MIMALLOC=1 \
-   STRIP="true" \
-   LIBDIR="${EPREFIX}/usr/$(get_libdir)"
-}
-
-src_test() {
-   emake \
-   SYSTEM_TBB=1 \
-   SYSTEM_MIMALLOC=1 \
-   check
-}
-
-src_install() {
-   emake \
-   SYSTEM_TBB=1 \
-   SYSTEM_MIMALLOC=1 \
-   DESTDIR="${D}" \
-   PREFIX="${EPREFIX}/usr" \
-   LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-   STRIP="true" \
-   install
-}

diff --git a/sys-devel/mold/mold-1.3.0.ebuild b/sys-devel/mold/mold-1.3.0.ebuild
deleted file mode 100644
index 2a7faac5052d..
--- a/sys-devel/mold/mold-1.3.0.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="A Modern Linker"

[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2022-07-02 Thread Sam James
commit: 317fc114898c370026672bdbd800bff54c81a71d
Author: Sam James  gentoo  org>
AuthorDate: Sat Jul  2 23:28:33 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jul  2 23:28:55 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=317fc114

sys-devel/mold: add 1.3.1

Signed-off-by: Sam James  gentoo.org>

 sys-devel/mold/Manifest  |  1 +
 sys-devel/mold/mold-1.3.1.ebuild | 97 
 2 files changed, 98 insertions(+)

diff --git a/sys-devel/mold/Manifest b/sys-devel/mold/Manifest
index 775461104562..0ca5f897179c 100644
--- a/sys-devel/mold/Manifest
+++ b/sys-devel/mold/Manifest
@@ -1,2 +1,3 @@
 DIST mold-1.2.1.tar.gz 4669615 BLAKE2B 
ba483a479d3eff0ea1dbce0da8c292b6a95c0faee2ac0f52d7be392e41d70e5ff3d7859e43fd721720bfb8331984823f2762acfd9dc51d3f5d8fd0a4865088c9
 SHA512 
fc39674b00119d09b3275ed7232356f0b25dad1a0f3a498f9db1a4835b6d4f9ea637ca9a643a05591ea895e8751d9bee43cdcb42303beb082462e76ddb42a0f1
 DIST mold-1.3.0.tar.gz 4689476 BLAKE2B 
2696f74095763ecda7407d1e677a568e0fddbaf5a3ba16dd21e998d80ff77968d77f46f981958087ada11ede181bee1f0bb8c511eede549a81f4edd7c9dc1280
 SHA512 
c9da8ece83049afcb815444c81d090a7bdead85b88898460cd94cfc83766b54793d3aa15ce7ce3bd8070a080d1241684c15ad81485ec39cfef768360c574964a
+DIST mold-1.3.1.tar.gz 4692379 BLAKE2B 
e34e9416cfc65d2097c4659ddc205a0c4492e50a1c6e4560006757e5c371d27410e38131f353cd0ee60b124e5fe42b0a1c50cdc3a7bed9f666596e608340e4fd
 SHA512 
f576d2fcfee5cb3bade5ba24dcdd3020a16131ce7d4c3a00c3f92b94785ed86f3f040a6f5814b9c975c4c3d90a2b8c36a8101d5fbf1bc0a4be316f4a4a6dcefa

diff --git a/sys-devel/mold/mold-1.3.1.ebuild b/sys-devel/mold/mold-1.3.1.ebuild
new file mode 100644
index ..2a7faac5052d
--- /dev/null
+++ b/sys-devel/mold/mold-1.3.1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="A Modern Linker"
+HOMEPAGE="https://github.com/rui314/mold;
+if [[ ${PV} ==  ]] ; 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"
+fi
+
+LICENSE="AGPL-3"
+SLOT="0"
+
+RDEPEND=">=dev-cpp/tbb-2021.4.0:=
+   sys-libs/zlib
+   !kernel_Darwin? (
+   >=dev-libs/mimalloc-2:=
+   dev-libs/openssl:=
+   )"
+# As of 1.1, xxhash is now a header-only dep, but it's now bundled :(
+# TODO: restore SYSTEM_XXHASH upstream?
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+   # Bug #841575
+   "${FILESDIR}"/${PN}-1.2.1-install-nopython.patch
+   "${FILESDIR}"/${PN}-1.3.0-openssl-pkgconfig.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() {
+   default
+
+   # 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_compile() {
+   tc-export CC CXX
+
+   emake \
+   CFLAGS="${CFLAGS}" \
+   CXXFLAGS="${CXXFLAGS}" \
+   SYSTEM_TBB=1 \
+   SYSTEM_MIMALLOC=1 \
+   STRIP="true" \
+   LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+}
+
+src_test() {
+   emake \
+   SYSTEM_TBB=1 \
+   SYSTEM_MIMALLOC=1 \
+   check
+}
+
+src_install() {
+   emake \
+   SYSTEM_TBB=1 \
+   SYSTEM_MIMALLOC=1 \
+   DESTDIR="${D}" \
+   PREFIX="${EPREFIX}/usr" \
+   LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+   STRIP="true" \
+   install
+}



[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2022-07-02 Thread Sam James
commit: ba6ddfdebdad616ab610dd6e6bc803c40a61be63
Author: Sam James  gentoo  org>
AuthorDate: Sat Jul  2 23:24:46 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jul  2 23:28:55 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba6ddfde

sys-devel/mold: drop 1.2

Signed-off-by: Sam James  gentoo.org>

 sys-devel/mold/Manifest|  1 -
 sys-devel/mold/mold-1.2.ebuild | 90 --
 2 files changed, 91 deletions(-)

diff --git a/sys-devel/mold/Manifest b/sys-devel/mold/Manifest
index 8ebf5f5d3d07..775461104562 100644
--- a/sys-devel/mold/Manifest
+++ b/sys-devel/mold/Manifest
@@ -1,3 +1,2 @@
 DIST mold-1.2.1.tar.gz 4669615 BLAKE2B 
ba483a479d3eff0ea1dbce0da8c292b6a95c0faee2ac0f52d7be392e41d70e5ff3d7859e43fd721720bfb8331984823f2762acfd9dc51d3f5d8fd0a4865088c9
 SHA512 
fc39674b00119d09b3275ed7232356f0b25dad1a0f3a498f9db1a4835b6d4f9ea637ca9a643a05591ea895e8751d9bee43cdcb42303beb082462e76ddb42a0f1
-DIST mold-1.2.tar.gz 4759743 BLAKE2B 
496a4804ac656d52cf54675740091a5e50048a2cc0aae9eab17a08ae88b16e138c364bf76c4d7959cf631d42ed69df3b18207620bf33f6675477ef38bbb0a016
 SHA512 
1308f5f274867a5d2d2c000a043ce645eff2a0c876fc1bec33c077cd7f5fc0f1f2b983211ca479cebc80f1ed3f3b0ea0d4c8f7e3e7f2124b713354b18ebc8676
 DIST mold-1.3.0.tar.gz 4689476 BLAKE2B 
2696f74095763ecda7407d1e677a568e0fddbaf5a3ba16dd21e998d80ff77968d77f46f981958087ada11ede181bee1f0bb8c511eede549a81f4edd7c9dc1280
 SHA512 
c9da8ece83049afcb815444c81d090a7bdead85b88898460cd94cfc83766b54793d3aa15ce7ce3bd8070a080d1241684c15ad81485ec39cfef768360c574964a

diff --git a/sys-devel/mold/mold-1.2.ebuild b/sys-devel/mold/mold-1.2.ebuild
deleted file mode 100644
index 83ebef232694..
--- a/sys-devel/mold/mold-1.2.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="A Modern Linker"
-HOMEPAGE="https://github.com/rui314/mold;
-if [[ ${PV} ==  ]] ; 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"
-fi
-
-LICENSE="AGPL-3"
-SLOT="0"
-
-RDEPEND=">=dev-cpp/tbb-2021.4.0:=
-   sys-libs/zlib
-   !kernel_Darwin? (
-   >=dev-libs/mimalloc-2:=
-   dev-libs/openssl:=
-   )"
-# As of 1.1, xxhash is now a header-only dep, but it's now bundled :(
-# TODO: restore SYSTEM_XXHASH upstream?
-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() {
-   default
-
-   # Needs unpackaged dwarfdump
-   rm test/elf/{{dead,compress}-debug-sections,compressed-debug-info}.sh 
|| die
-
-   # Heavy test, needs qemu
-   rm test/elf/gdb-index.sh || die
-
-   # Sandbox sadness
-   rm test/elf/run.sh || die
-   sed -i 's|$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/{hello,ifunc}-static-pie.sh || die
-   fi
-}
-
-src_compile() {
-   tc-export CC CXX
-
-   emake \
-   CFLAGS="${CFLAGS}" \
-   CXXFLAGS="${CXXFLAGS}" \
-   SYSTEM_TBB=1 \
-   SYSTEM_MIMALLOC=1 \
-   STRIP="true" \
-   LIBDIR="${EPREFIX}/usr/$(get_libdir)"
-}
-
-src_test() {
-   emake \
-   SYSTEM_TBB=1 \
-   SYSTEM_MIMALLOC=1 \
-   check
-}
-
-src_install() {
-   emake \
-   SYSTEM_TBB=1 \
-   SYSTEM_MIMALLOC=1 \
-   DESTDIR="${D}" \
-   PREFIX="${EPREFIX}/usr" \
-   LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-   STRIP="true" \
-   install
-}



[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2022-06-29 Thread Matthew Smith
commit: ed0103e1efc72ff81c5cdc894fe3d81851b5637b
Author: Matthew Smith  gentoo  org>
AuthorDate: Wed Jun 29 07:32:18 2022 +
Commit: Matthew Smith  gentoo  org>
CommitDate: Wed Jun 29 07:34:27 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed0103e1

sys-devel/mold: fix prepare phase when glibc has no static-pie

Closes: https://bugs.gentoo.org/854474
Signed-off-by: Matthew Smith  gentoo.org>

 sys-devel/mold/mold-1.3.0.ebuild | 2 +-
 sys-devel/mold/mold-.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-devel/mold/mold-1.3.0.ebuild b/sys-devel/mold/mold-1.3.0.ebuild
index 1fe9a5a08e35..2a7faac5052d 100644
--- a/sys-devel/mold/mold-1.3.0.ebuild
+++ b/sys-devel/mold/mold-1.3.0.ebuild
@@ -62,7 +62,7 @@ src_prepare() {
 
# static-pie tests require glibc built with static-pie support
if ! has_version -d 'sys-libs/glibc[static-pie(+)]'; then
-   rm test/elf/{hello,ifunc}-static-pie.sh || die
+   rm test/elf/{,ifunc-}static-pie.sh || die
fi
 }
 

diff --git a/sys-devel/mold/mold-.ebuild b/sys-devel/mold/mold-.ebuild
index 1fe9a5a08e35..2a7faac5052d 100644
--- a/sys-devel/mold/mold-.ebuild
+++ b/sys-devel/mold/mold-.ebuild
@@ -62,7 +62,7 @@ src_prepare() {
 
# static-pie tests require glibc built with static-pie support
if ! has_version -d 'sys-libs/glibc[static-pie(+)]'; then
-   rm test/elf/{hello,ifunc}-static-pie.sh || die
+   rm test/elf/{,ifunc-}static-pie.sh || die
fi
 }
 



[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2022-06-26 Thread Matthew Smith
commit: 6eac8f2838eee9953bfc4ab0ece59cf396d6e026
Author: Matthew Smith  gentoo  org>
AuthorDate: Sun Jun 26 12:52:04 2022 +
Commit: Matthew Smith  gentoo  org>
CommitDate: Sun Jun 26 12:54:23 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6eac8f28

sys-devel/mold: fix tests

Fix LD_PRELOAD path in mold-wrapper tests, and delete more tests that
require QEMU.

Signed-off-by: Matthew Smith  gentoo.org>

 sys-devel/mold/mold-.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sys-devel/mold/mold-.ebuild b/sys-devel/mold/mold-.ebuild
index d5c163c1ba90..1fe9a5a08e35 100644
--- a/sys-devel/mold/mold-.ebuild
+++ b/sys-devel/mold/mold-.ebuild
@@ -53,10 +53,11 @@ src_prepare() {
 
# 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|$mold-wrapper.so|"& ${LD_PRELOAD}"|' \
+   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



[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2022-06-26 Thread Matthew Smith
commit: 417433589da543300cb15f296a2bf83006870973
Author: Matthew Smith  gentoo  org>
AuthorDate: Sun Jun 26 12:53:26 2022 +
Commit: Matthew Smith  gentoo  org>
CommitDate: Sun Jun 26 12:54:26 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41743358

sys-devel/mold: add 1.3.0

Signed-off-by: Matthew Smith  gentoo.org>

 sys-devel/mold/Manifest  |  1 +
 sys-devel/mold/mold-1.3.0.ebuild | 97 
 2 files changed, 98 insertions(+)

diff --git a/sys-devel/mold/Manifest b/sys-devel/mold/Manifest
index 268158e76252..8ebf5f5d3d07 100644
--- a/sys-devel/mold/Manifest
+++ b/sys-devel/mold/Manifest
@@ -1,2 +1,3 @@
 DIST mold-1.2.1.tar.gz 4669615 BLAKE2B 
ba483a479d3eff0ea1dbce0da8c292b6a95c0faee2ac0f52d7be392e41d70e5ff3d7859e43fd721720bfb8331984823f2762acfd9dc51d3f5d8fd0a4865088c9
 SHA512 
fc39674b00119d09b3275ed7232356f0b25dad1a0f3a498f9db1a4835b6d4f9ea637ca9a643a05591ea895e8751d9bee43cdcb42303beb082462e76ddb42a0f1
 DIST mold-1.2.tar.gz 4759743 BLAKE2B 
496a4804ac656d52cf54675740091a5e50048a2cc0aae9eab17a08ae88b16e138c364bf76c4d7959cf631d42ed69df3b18207620bf33f6675477ef38bbb0a016
 SHA512 
1308f5f274867a5d2d2c000a043ce645eff2a0c876fc1bec33c077cd7f5fc0f1f2b983211ca479cebc80f1ed3f3b0ea0d4c8f7e3e7f2124b713354b18ebc8676
+DIST mold-1.3.0.tar.gz 4689476 BLAKE2B 
2696f74095763ecda7407d1e677a568e0fddbaf5a3ba16dd21e998d80ff77968d77f46f981958087ada11ede181bee1f0bb8c511eede549a81f4edd7c9dc1280
 SHA512 
c9da8ece83049afcb815444c81d090a7bdead85b88898460cd94cfc83766b54793d3aa15ce7ce3bd8070a080d1241684c15ad81485ec39cfef768360c574964a

diff --git a/sys-devel/mold/mold-1.3.0.ebuild b/sys-devel/mold/mold-1.3.0.ebuild
new file mode 100644
index ..1fe9a5a08e35
--- /dev/null
+++ b/sys-devel/mold/mold-1.3.0.ebuild
@@ -0,0 +1,97 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="A Modern Linker"
+HOMEPAGE="https://github.com/rui314/mold;
+if [[ ${PV} ==  ]] ; 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"
+fi
+
+LICENSE="AGPL-3"
+SLOT="0"
+
+RDEPEND=">=dev-cpp/tbb-2021.4.0:=
+   sys-libs/zlib
+   !kernel_Darwin? (
+   >=dev-libs/mimalloc-2:=
+   dev-libs/openssl:=
+   )"
+# As of 1.1, xxhash is now a header-only dep, but it's now bundled :(
+# TODO: restore SYSTEM_XXHASH upstream?
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+   # Bug #841575
+   "${FILESDIR}"/${PN}-1.2.1-install-nopython.patch
+   "${FILESDIR}"/${PN}-1.3.0-openssl-pkgconfig.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() {
+   default
+
+   # 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/{hello,ifunc}-static-pie.sh || die
+   fi
+}
+
+src_compile() {
+   tc-export CC CXX
+
+   emake \
+   CFLAGS="${CFLAGS}" \
+   CXXFLAGS="${CXXFLAGS}" \
+   SYSTEM_TBB=1 \
+   SYSTEM_MIMALLOC=1 \
+   STRIP="true" \
+   LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+}
+
+src_test() {
+   emake \
+   SYSTEM_TBB=1 \
+   SYSTEM_MIMALLOC=1 \
+   check
+}
+
+src_install() {
+   emake \
+   SYSTEM_TBB=1 \
+   SYSTEM_MIMALLOC=1 \
+   DESTDIR="${D}" \
+   PREFIX="${EPREFIX}/usr" \
+   LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+   STRIP="true" \
+   install
+}



[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/, sys-devel/mold/files/

2022-06-26 Thread Matthew Smith
commit: 78147a1e291cd661a15126c31ff4374675609a94
Author: Matthew Smith  gentoo  org>
AuthorDate: Sun Jun 26 12:46:10 2022 +
Commit: Matthew Smith  gentoo  org>
CommitDate: Sun Jun 26 12:54:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78147a1e

sys-devel/mold: use pkg-config to find OpenSSL

Signed-off-by: Matthew Smith  gentoo.org>

 .../mold/files/mold-1.3.0-openssl-pkgconfig.patch  | 28 ++
 sys-devel/mold/mold-.ebuild|  1 +
 2 files changed, 29 insertions(+)

diff --git a/sys-devel/mold/files/mold-1.3.0-openssl-pkgconfig.patch 
b/sys-devel/mold/files/mold-1.3.0-openssl-pkgconfig.patch
new file mode 100644
index ..d2ed0af47b41
--- /dev/null
+++ b/sys-devel/mold/files/mold-1.3.0-openssl-pkgconfig.patch
@@ -0,0 +1,28 @@
+From a4fde946f49cddf4f7c1eceb3b86ca38375cec1d Mon Sep 17 00:00:00 2001
+From: Matthew Smith 
+Date: Sun, 26 Jun 2022 13:44:36 +0100
+Subject: [PATCH] Revert "Do not use pkg-config"
+
+This reverts commit 4ef90d4316bbba3a4b8902e38bf5f68171cc6ab7.
+--- a/Makefile
 b/Makefile
+@@ -18,6 +18,9 @@ ifeq ($(origin CXX), default)
+   CXX = c++
+ endif
+ 
++# Allow overriding pkg-config binary
++PKG_CONFIG = pkg-config
++
+ # If you want to keep symbols in the installed binary, run make with
+ # `STRIP=true` to run /bin/true instead of the strip command.
+ STRIP = strip
+@@ -100,7 +103,8 @@ ifeq ($(OS), Darwin)
+ endif
+ 
+ ifeq ($(NEEDS_LIBCRYPTO), 1)
+-  MOLD_LDFLAGS += -lcrypto
++  MOLD_CXXFLAGS += $(shell $(PKG_CONFIG) --cflags-only-I openssl)
++  MOLD_LDFLAGS += $(shell $(PKG_CONFIG) --libs-only-L openssl) -lcrypto
+ endif
+ 
+ # '-latomic' flag is needed building on riscv64 system.

diff --git a/sys-devel/mold/mold-.ebuild b/sys-devel/mold/mold-.ebuild
index 87931221e192..d5c163c1ba90 100644
--- a/sys-devel/mold/mold-.ebuild
+++ b/sys-devel/mold/mold-.ebuild
@@ -31,6 +31,7 @@ DEPEND="${RDEPEND}"
 PATCHES=(
# Bug #841575
"${FILESDIR}"/${PN}-1.2.1-install-nopython.patch
+   "${FILESDIR}"/${PN}-1.3.0-openssl-pkgconfig.patch
 )
 
 pkg_pretend() {



[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2022-05-04 Thread Sam James
commit: 5b06668aa584e919cb9de660da54ee8fa8cac215
Author: Sam James  gentoo  org>
AuthorDate: Wed May  4 05:45:16 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed May  4 23:28:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b06668a

sys-devel/mold: drop 1.1.1

Signed-off-by: Sam James  gentoo.org>

 sys-devel/mold/Manifest  |  1 -
 sys-devel/mold/mold-1.1.1.ebuild | 87 
 2 files changed, 88 deletions(-)

diff --git a/sys-devel/mold/Manifest b/sys-devel/mold/Manifest
index 0302d4f724fe..268158e76252 100644
--- a/sys-devel/mold/Manifest
+++ b/sys-devel/mold/Manifest
@@ -1,3 +1,2 @@
-DIST mold-1.1.1.tar.gz 4530297 BLAKE2B 
78f3beee1b463b3ca028fd72ecf92deb9e8848a4f9cb07c7c549666ef3fef038f395dd30e755be2807dc504b4c3f4893ca359154de9c944c2a03e04f37f5ccea
 SHA512 
981d9737ed7a23134b9bafc04db0cd0233ab4fd588a3b250688dba64936fe84f6736168379fc3e4485273bcef11bca70e5c426b043b5d8b9775ae1cd3aea5b52
 DIST mold-1.2.1.tar.gz 4669615 BLAKE2B 
ba483a479d3eff0ea1dbce0da8c292b6a95c0faee2ac0f52d7be392e41d70e5ff3d7859e43fd721720bfb8331984823f2762acfd9dc51d3f5d8fd0a4865088c9
 SHA512 
fc39674b00119d09b3275ed7232356f0b25dad1a0f3a498f9db1a4835b6d4f9ea637ca9a643a05591ea895e8751d9bee43cdcb42303beb082462e76ddb42a0f1
 DIST mold-1.2.tar.gz 4759743 BLAKE2B 
496a4804ac656d52cf54675740091a5e50048a2cc0aae9eab17a08ae88b16e138c364bf76c4d7959cf631d42ed69df3b18207620bf33f6675477ef38bbb0a016
 SHA512 
1308f5f274867a5d2d2c000a043ce645eff2a0c876fc1bec33c077cd7f5fc0f1f2b983211ca479cebc80f1ed3f3b0ea0d4c8f7e3e7f2124b713354b18ebc8676

diff --git a/sys-devel/mold/mold-1.1.1.ebuild b/sys-devel/mold/mold-1.1.1.ebuild
deleted file mode 100644
index 5ea54e0926db..
--- a/sys-devel/mold/mold-1.1.1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="A Modern Linker"
-HOMEPAGE="https://github.com/rui314/mold;
-if [[ ${PV} ==  ]] ; 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"
-fi
-
-LICENSE="AGPL-3"
-SLOT="0"
-
-RDEPEND=">=dev-cpp/tbb-2021.4.0:=
-   sys-libs/zlib
-   !kernel_Darwin? (
-   >=dev-libs/mimalloc-2:=
-   dev-libs/openssl:=
-   )"
-# As of 1.1, xxhash is now a header-only dep, but it's now bundled :(
-# TODO: restore SYSTEM_XXHASH upstream?
-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() {
-   default
-
-   # Needs unpackaged dwarfdump
-   rm test/elf/{compress-debug-sections,compressed-debug-info}.sh || die
-
-   # Sandbox sadness
-   rm test/elf/run.sh || die
-   sed -i 's|$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/{hello,ifunc}-static-pie.sh || die
-   fi
-}
-
-src_compile() {
-   tc-export CC CXX
-
-   emake \
-   CFLAGS="${CFLAGS}" \
-   CXXFLAGS="${CXXFLAGS}" \
-   SYSTEM_TBB=1 \
-   SYSTEM_MIMALLOC=1 \
-   STRIP="true" \
-   LIBDIR="${EPREFIX}/usr/$(get_libdir)"
-}
-
-src_test() {
-   emake \
-   SYSTEM_TBB=1 \
-   SYSTEM_MIMALLOC=1 \
-   check
-}
-
-src_install() {
-   emake \
-   SYSTEM_TBB=1 \
-   SYSTEM_MIMALLOC=1 \
-   DESTDIR="${D}" \
-   PREFIX="${EPREFIX}/usr" \
-   LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-   STRIP="true" \
-   install
-}



[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/, sys-devel/mold/files/

2022-04-30 Thread Matthew Smith
commit: 135d88401a60dbbc0905c1f16391cea46b8d0cc0
Author: Matthew Smith  gentoo  org>
AuthorDate: Sat Apr 30 06:47:12 2022 +
Commit: Matthew Smith  gentoo  org>
CommitDate: Sat Apr 30 06:47:46 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=135d8840

sys-devel/mold: don't invoke python during build

Closes: https://bugs.gentoo.org/841575
Signed-off-by: Matthew Smith  gentoo.org>

 .../mold/files/mold-1.2.1-install-nopython.patch   | 34 ++
 .../{mold-1.2.1.ebuild => mold-1.2.1-r1.ebuild}|  5 
 sys-devel/mold/mold-.ebuild|  5 
 3 files changed, 44 insertions(+)

diff --git a/sys-devel/mold/files/mold-1.2.1-install-nopython.patch 
b/sys-devel/mold/files/mold-1.2.1-install-nopython.patch
new file mode 100644
index ..661d3dcf392f
--- /dev/null
+++ b/sys-devel/mold/files/mold-1.2.1-install-nopython.patch
@@ -0,0 +1,34 @@
+From 4fb6d4208cfb20bad4a3491a18e78409b5a8183f Mon Sep 17 00:00:00 2001
+From: Matthew Smith 
+Date: Sat, 30 Apr 2022 07:42:50 +0100
+Subject: [PATCH] Don't invoke Python to create libexec/mold/ld symlink
+
+Reverts commits 8073a92614fb59f59570031badab5dd4bc3b4f7f and
+5803c3c200f301adc3abdb66df16d3d669712d70.
+
+Bug #841575
+---
+ Makefile | 7 +--
+ 1 file changed, 1 insertion(+), 6 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index d1abc850..10e053a9 100644
+--- a/Makefile
 b/Makefile
+@@ -204,12 +204,7 @@ install: all
+   $(STRIP) $D$(LIBDIR)/mold/mold-wrapper.so
+ 
+   $(INSTALL) -d $D$(LIBEXECDIR)/mold
+-
+-# We want to make a symblink with a relative path, so that users can
+-# move the entire directory to other place without breaking the reference.
+-# GNU ln supports `--relative` to do that, but that's not supported by
+-# non-GNU systems. So we use Python to compute a relative path.
+-  ln -sf `python3 -c "import os.path; 
print(os.path.relpath('$(BINDIR)/mold', '$(LIBEXECDIR)/mold'))"` 
$D$(LIBEXECDIR)/mold/ld
++  ln -sf $(BINDIR)/mold $D$(LIBEXECDIR)/mold/ld
+ 
+   $(INSTALL) -d $D$(MANDIR)/man1
+   $(INSTALL_DATA) docs/mold.1 $D$(MANDIR)/man1
+-- 
+2.35.3
+

diff --git a/sys-devel/mold/mold-1.2.1.ebuild 
b/sys-devel/mold/mold-1.2.1-r1.ebuild
similarity index 96%
rename from sys-devel/mold/mold-1.2.1.ebuild
rename to sys-devel/mold/mold-1.2.1-r1.ebuild
index a9e0aa6a2c2e..87931221e192 100644
--- a/sys-devel/mold/mold-1.2.1.ebuild
+++ b/sys-devel/mold/mold-1.2.1-r1.ebuild
@@ -28,6 +28,11 @@ RDEPEND=">=dev-cpp/tbb-2021.4.0:=
 # TODO: restore SYSTEM_XXHASH upstream?
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+   # Bug #841575
+   "${FILESDIR}"/${PN}-1.2.1-install-nopython.patch
+)
+
 pkg_pretend() {
# Requires a c++20 compiler, see #831473
if [[ ${MERGE_TYPE} != binary ]]; then

diff --git a/sys-devel/mold/mold-.ebuild b/sys-devel/mold/mold-.ebuild
index a9e0aa6a2c2e..87931221e192 100644
--- a/sys-devel/mold/mold-.ebuild
+++ b/sys-devel/mold/mold-.ebuild
@@ -28,6 +28,11 @@ RDEPEND=">=dev-cpp/tbb-2021.4.0:=
 # TODO: restore SYSTEM_XXHASH upstream?
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+   # Bug #841575
+   "${FILESDIR}"/${PN}-1.2.1-install-nopython.patch
+)
+
 pkg_pretend() {
# Requires a c++20 compiler, see #831473
if [[ ${MERGE_TYPE} != binary ]]; then



[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2022-04-28 Thread Matthew Smith
commit: 027350c3ec68f9e01c815c710e7f86cc01e1f9ee
Author: Matthew Smith  gentoo  org>
AuthorDate: Thu Apr 28 16:43:15 2022 +
Commit: Matthew Smith  gentoo  org>
CommitDate: Thu Apr 28 16:43:15 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=027350c3

sys-devel/mold: add 1.2.1

Signed-off-by: Matthew Smith  gentoo.org>

 sys-devel/mold/Manifest  |  1 +
 sys-devel/mold/mold-1.2.1.ebuild | 90 
 2 files changed, 91 insertions(+)

diff --git a/sys-devel/mold/Manifest b/sys-devel/mold/Manifest
index a283a116cc2c..0302d4f724fe 100644
--- a/sys-devel/mold/Manifest
+++ b/sys-devel/mold/Manifest
@@ -1,2 +1,3 @@
 DIST mold-1.1.1.tar.gz 4530297 BLAKE2B 
78f3beee1b463b3ca028fd72ecf92deb9e8848a4f9cb07c7c549666ef3fef038f395dd30e755be2807dc504b4c3f4893ca359154de9c944c2a03e04f37f5ccea
 SHA512 
981d9737ed7a23134b9bafc04db0cd0233ab4fd588a3b250688dba64936fe84f6736168379fc3e4485273bcef11bca70e5c426b043b5d8b9775ae1cd3aea5b52
+DIST mold-1.2.1.tar.gz 4669615 BLAKE2B 
ba483a479d3eff0ea1dbce0da8c292b6a95c0faee2ac0f52d7be392e41d70e5ff3d7859e43fd721720bfb8331984823f2762acfd9dc51d3f5d8fd0a4865088c9
 SHA512 
fc39674b00119d09b3275ed7232356f0b25dad1a0f3a498f9db1a4835b6d4f9ea637ca9a643a05591ea895e8751d9bee43cdcb42303beb082462e76ddb42a0f1
 DIST mold-1.2.tar.gz 4759743 BLAKE2B 
496a4804ac656d52cf54675740091a5e50048a2cc0aae9eab17a08ae88b16e138c364bf76c4d7959cf631d42ed69df3b18207620bf33f6675477ef38bbb0a016
 SHA512 
1308f5f274867a5d2d2c000a043ce645eff2a0c876fc1bec33c077cd7f5fc0f1f2b983211ca479cebc80f1ed3f3b0ea0d4c8f7e3e7f2124b713354b18ebc8676

diff --git a/sys-devel/mold/mold-1.2.1.ebuild b/sys-devel/mold/mold-1.2.1.ebuild
new file mode 100644
index ..a9e0aa6a2c2e
--- /dev/null
+++ b/sys-devel/mold/mold-1.2.1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="A Modern Linker"
+HOMEPAGE="https://github.com/rui314/mold;
+if [[ ${PV} ==  ]] ; 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"
+fi
+
+LICENSE="AGPL-3"
+SLOT="0"
+
+RDEPEND=">=dev-cpp/tbb-2021.4.0:=
+   sys-libs/zlib
+   !kernel_Darwin? (
+   >=dev-libs/mimalloc-2:=
+   dev-libs/openssl:=
+   )"
+# As of 1.1, xxhash is now a header-only dep, but it's now bundled :(
+# TODO: restore SYSTEM_XXHASH upstream?
+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() {
+   default
+
+   # 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
+
+   # Sandbox sadness
+   rm test/elf/run.sh || die
+   sed -i 's|$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/{hello,ifunc}-static-pie.sh || die
+   fi
+}
+
+src_compile() {
+   tc-export CC CXX
+
+   emake \
+   CFLAGS="${CFLAGS}" \
+   CXXFLAGS="${CXXFLAGS}" \
+   SYSTEM_TBB=1 \
+   SYSTEM_MIMALLOC=1 \
+   STRIP="true" \
+   LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+}
+
+src_test() {
+   emake \
+   SYSTEM_TBB=1 \
+   SYSTEM_MIMALLOC=1 \
+   check
+}
+
+src_install() {
+   emake \
+   SYSTEM_TBB=1 \
+   SYSTEM_MIMALLOC=1 \
+   DESTDIR="${D}" \
+   PREFIX="${EPREFIX}/usr" \
+   LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+   STRIP="true" \
+   install
+}



[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2022-04-28 Thread Matthew Smith
commit: 690c367c4bddbc30eb7e6be580264cba166a20a2
Author: Matthew Smith  gentoo  org>
AuthorDate: Thu Apr 28 16:42:57 2022 +
Commit: Matthew Smith  gentoo  org>
CommitDate: Thu Apr 28 16:42:57 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=690c367c

sys-devel/mold: handle renamed/additional tests

Signed-off-by: Matthew Smith  gentoo.org>

 sys-devel/mold/mold-.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-devel/mold/mold-.ebuild b/sys-devel/mold/mold-.ebuild
index 83ebef232694..a9e0aa6a2c2e 100644
--- a/sys-devel/mold/mold-.ebuild
+++ b/sys-devel/mold/mold-.ebuild
@@ -45,8 +45,8 @@ src_prepare() {
# Needs unpackaged dwarfdump
rm test/elf/{{dead,compress}-debug-sections,compressed-debug-info}.sh 
|| die
 
-   # Heavy test, needs qemu
-   rm test/elf/gdb-index.sh || die
+   # Heavy tests, need qemu
+   rm test/elf/gdb-index-{compress-output,dwarf{2,3,4,5}}.sh || die
 
# Sandbox sadness
rm test/elf/run.sh || die



[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2022-04-15 Thread Matthew Smith
commit: 76ec1c2d6731c46616d293f7d75d6ea929b0cb21
Author: Matthew Smith  gentoo  org>
AuthorDate: Fri Apr 15 12:38:34 2022 +
Commit: Matthew Smith  gentoo  org>
CommitDate: Fri Apr 15 12:38:34 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76ec1c2d

sys-devel/mold: disable more tests

Signed-off-by: Matthew Smith  gentoo.org>

 sys-devel/mold/mold-.ebuild | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sys-devel/mold/mold-.ebuild b/sys-devel/mold/mold-.ebuild
index 5ea54e0926db..83ebef232694 100644
--- a/sys-devel/mold/mold-.ebuild
+++ b/sys-devel/mold/mold-.ebuild
@@ -43,7 +43,10 @@ src_prepare() {
default
 
# Needs unpackaged dwarfdump
-   rm test/elf/{compress-debug-sections,compressed-debug-info}.sh || die
+   rm test/elf/{{dead,compress}-debug-sections,compressed-debug-info}.sh 
|| die
+
+   # Heavy test, needs qemu
+   rm test/elf/gdb-index.sh || die
 
# Sandbox sadness
rm test/elf/run.sh || die



[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2022-04-15 Thread Matthew Smith
commit: 710f7aa968eb2ce43130e13d94362f677f23be56
Author: Matthew Smith  gentoo  org>
AuthorDate: Fri Apr 15 12:39:04 2022 +
Commit: Matthew Smith  gentoo  org>
CommitDate: Fri Apr 15 12:39:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=710f7aa9

sys-devel/mold: add 1.2

Closes: https://bugs.gentoo.org/837977
Signed-off-by: Matthew Smith  gentoo.org>

 sys-devel/mold/Manifest|  1 +
 sys-devel/mold/mold-1.2.ebuild | 90 ++
 2 files changed, 91 insertions(+)

diff --git a/sys-devel/mold/Manifest b/sys-devel/mold/Manifest
index 469b6a5f2e24..a283a116cc2c 100644
--- a/sys-devel/mold/Manifest
+++ b/sys-devel/mold/Manifest
@@ -1 +1,2 @@
 DIST mold-1.1.1.tar.gz 4530297 BLAKE2B 
78f3beee1b463b3ca028fd72ecf92deb9e8848a4f9cb07c7c549666ef3fef038f395dd30e755be2807dc504b4c3f4893ca359154de9c944c2a03e04f37f5ccea
 SHA512 
981d9737ed7a23134b9bafc04db0cd0233ab4fd588a3b250688dba64936fe84f6736168379fc3e4485273bcef11bca70e5c426b043b5d8b9775ae1cd3aea5b52
+DIST mold-1.2.tar.gz 4759743 BLAKE2B 
496a4804ac656d52cf54675740091a5e50048a2cc0aae9eab17a08ae88b16e138c364bf76c4d7959cf631d42ed69df3b18207620bf33f6675477ef38bbb0a016
 SHA512 
1308f5f274867a5d2d2c000a043ce645eff2a0c876fc1bec33c077cd7f5fc0f1f2b983211ca479cebc80f1ed3f3b0ea0d4c8f7e3e7f2124b713354b18ebc8676

diff --git a/sys-devel/mold/mold-1.2.ebuild b/sys-devel/mold/mold-1.2.ebuild
new file mode 100644
index ..83ebef232694
--- /dev/null
+++ b/sys-devel/mold/mold-1.2.ebuild
@@ -0,0 +1,90 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="A Modern Linker"
+HOMEPAGE="https://github.com/rui314/mold;
+if [[ ${PV} ==  ]] ; 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"
+fi
+
+LICENSE="AGPL-3"
+SLOT="0"
+
+RDEPEND=">=dev-cpp/tbb-2021.4.0:=
+   sys-libs/zlib
+   !kernel_Darwin? (
+   >=dev-libs/mimalloc-2:=
+   dev-libs/openssl:=
+   )"
+# As of 1.1, xxhash is now a header-only dep, but it's now bundled :(
+# TODO: restore SYSTEM_XXHASH upstream?
+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() {
+   default
+
+   # Needs unpackaged dwarfdump
+   rm test/elf/{{dead,compress}-debug-sections,compressed-debug-info}.sh 
|| die
+
+   # Heavy test, needs qemu
+   rm test/elf/gdb-index.sh || die
+
+   # Sandbox sadness
+   rm test/elf/run.sh || die
+   sed -i 's|$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/{hello,ifunc}-static-pie.sh || die
+   fi
+}
+
+src_compile() {
+   tc-export CC CXX
+
+   emake \
+   CFLAGS="${CFLAGS}" \
+   CXXFLAGS="${CXXFLAGS}" \
+   SYSTEM_TBB=1 \
+   SYSTEM_MIMALLOC=1 \
+   STRIP="true" \
+   LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+}
+
+src_test() {
+   emake \
+   SYSTEM_TBB=1 \
+   SYSTEM_MIMALLOC=1 \
+   check
+}
+
+src_install() {
+   emake \
+   SYSTEM_TBB=1 \
+   SYSTEM_MIMALLOC=1 \
+   DESTDIR="${D}" \
+   PREFIX="${EPREFIX}/usr" \
+   LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+   STRIP="true" \
+   install
+}



[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2022-03-14 Thread Sam James
commit: 9e10d5214ecc5a04d6f561e1f9608fb22741338d
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 14 12:24:58 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 14 12:24:58 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e10d521

sys-devel/mold: drop 1.0.3, 1.1

Signed-off-by: Sam James  gentoo.org>

 sys-devel/mold/Manifest  |  2 -
 sys-devel/mold/mold-1.0.3.ebuild | 82 
 sys-devel/mold/mold-1.1.ebuild   | 81 ---
 3 files changed, 165 deletions(-)

diff --git a/sys-devel/mold/Manifest b/sys-devel/mold/Manifest
index 5e79aa2e22f9..469b6a5f2e24 100644
--- a/sys-devel/mold/Manifest
+++ b/sys-devel/mold/Manifest
@@ -1,3 +1 @@
-DIST mold-1.0.3.tar.gz 4501162 BLAKE2B 
68db6708ae05b3a4caf19bff8b381c9a7d045b7313e15ee9c0765042ef02898404527735a8f5379a2d213a7654f656cfe24eb20497d6d4f5e9ed666988050733
 SHA512 
50b4a80c8b7a4925e6e85a35e92529867648df61ca016ee662b3fce7cf9d4a8fd717311ec0542aa594f44b49d48de34d51d7e94cae0f21bda01fdd4418990f38
 DIST mold-1.1.1.tar.gz 4530297 BLAKE2B 
78f3beee1b463b3ca028fd72ecf92deb9e8848a4f9cb07c7c549666ef3fef038f395dd30e755be2807dc504b4c3f4893ca359154de9c944c2a03e04f37f5ccea
 SHA512 
981d9737ed7a23134b9bafc04db0cd0233ab4fd588a3b250688dba64936fe84f6736168379fc3e4485273bcef11bca70e5c426b043b5d8b9775ae1cd3aea5b52
-DIST mold-1.1.tar.gz 4522886 BLAKE2B 
6c63c171a6da090c3db391fa90e0095b2ab6f995e1d23be0dd93bb3057b3b9e5f5cf1deab5c80f6db3fa58bab69195a07a7e972373b9f1e633687cb8d4d45361
 SHA512 
b8b125c77563abe2741c2f32d73ab2b12dff275b92b633fcd015336c6ea735e38e95c3d2afb50e5baace2023d4f9de3eb50d53053eabc2cd2f045110eef4cc1e

diff --git a/sys-devel/mold/mold-1.0.3.ebuild b/sys-devel/mold/mold-1.0.3.ebuild
deleted file mode 100644
index 5536efda5951..
--- a/sys-devel/mold/mold-1.0.3.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="A Modern Linker"
-HOMEPAGE="https://github.com/rui314/mold;
-if [[ ${PV} ==  ]] ; 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"
-fi
-
-LICENSE="AGPL-3"
-SLOT="0"
-
-# Try again after 1.0 (nearly there, but path-related issues)
-# https://github.com/rui314/mold/issues/137
-RESTRICT="test"
-
-RDEPEND=">=dev-cpp/tbb-2021.4.0:=
-   dev-libs/xxhash:=
-   sys-libs/zlib
-   !kernel_Darwin? (
-   >=dev-libs/mimalloc-2:=
-   dev-libs/openssl:=
-   )"
-DEPEND="${RDEPEND}"
-
-pkg_pretend() {
-   # Requires a c++20 compiler, see #831437
-   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() {
-   default
-
-   # Needs unpackaged dwarfdump
-   rm test/elf/{compress-debug-sections,compressed-debug-info}.sh || die
-}
-
-src_compile() {
-   tc-export CC CXX
-
-   emake \
-   CFLAGS="${CFLAGS}" \
-   CXXFLAGS="${CXXFLAGS}" \
-   SYSTEM_TBB=1 \
-   SYSTEM_MIMALLOC=1 \
-   SYSTEM_XXHASH=1 \
-   STRIP="true" \
-   LIBDIR="${EPREFIX}/usr/$(get_libdir)"
-}
-
-src_test() {
-   emake \
-   SYSTEM_TBB=1 \
-   SYSTEM_MIMALLOC=1 \
-   check
-}
-
-src_install() {
-   emake \
-   SYSTEM_TBB=1 \
-   SYSTEM_MIMALLOC=1 \
-   SYSTEM_XXHASH=1 \
-   DESTDIR="${D}" \
-   PREFIX="${EPREFIX}/usr" \
-   LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-   STRIP="true" \
-   install
-}

diff --git a/sys-devel/mold/mold-1.1.ebuild b/sys-devel/mold/mold-1.1.ebuild
deleted file mode 100644
index 351ef38c6b51..
--- a/sys-devel/mold/mold-1.1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="A Modern Linker"
-HOMEPAGE="https://github.com/rui314/mold;
-if [[ ${PV} ==  ]] ; 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"
-fi
-
-LICENSE="AGPL-3"
-SLOT="0"
-
-# Try again after 1.0 (nearly there, but path-related issues)
-# https://github.com/rui314/mold/issues/137
-RESTRICT="test"
-
-RDEPEND=">=dev-cpp/tbb-2021.4.0:=
-   sys-libs/zlib
-   

[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2022-03-08 Thread Matthew Smith
commit: 9fa96122168910e8422055ef4953ce864fe77f0c
Author: Matthew Smith  gentoo  org>
AuthorDate: Tue Mar  8 19:53:18 2022 +
Commit: Matthew Smith  gentoo  org>
CommitDate: Tue Mar  8 19:53:58 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fa96122

sys-devel/mold: Enable tests

Signed-off-by: Matthew Smith  gentoo.org>

 sys-devel/mold/mold-1.1.1.ebuild | 14 ++
 sys-devel/mold/mold-.ebuild  | 14 ++
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/sys-devel/mold/mold-1.1.1.ebuild b/sys-devel/mold/mold-1.1.1.ebuild
index 351ef38c6b51..5ea54e0926db 100644
--- a/sys-devel/mold/mold-1.1.1.ebuild
+++ b/sys-devel/mold/mold-1.1.1.ebuild
@@ -18,10 +18,6 @@ fi
 LICENSE="AGPL-3"
 SLOT="0"
 
-# Try again after 1.0 (nearly there, but path-related issues)
-# https://github.com/rui314/mold/issues/137
-RESTRICT="test"
-
 RDEPEND=">=dev-cpp/tbb-2021.4.0:=
sys-libs/zlib
!kernel_Darwin? (
@@ -48,6 +44,16 @@ src_prepare() {
 
# Needs unpackaged dwarfdump
rm test/elf/{compress-debug-sections,compressed-debug-info}.sh || die
+
+   # Sandbox sadness
+   rm test/elf/run.sh || die
+   sed -i 's|$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/{hello,ifunc}-static-pie.sh || die
+   fi
 }
 
 src_compile() {

diff --git a/sys-devel/mold/mold-.ebuild b/sys-devel/mold/mold-.ebuild
index 351ef38c6b51..5ea54e0926db 100644
--- a/sys-devel/mold/mold-.ebuild
+++ b/sys-devel/mold/mold-.ebuild
@@ -18,10 +18,6 @@ fi
 LICENSE="AGPL-3"
 SLOT="0"
 
-# Try again after 1.0 (nearly there, but path-related issues)
-# https://github.com/rui314/mold/issues/137
-RESTRICT="test"
-
 RDEPEND=">=dev-cpp/tbb-2021.4.0:=
sys-libs/zlib
!kernel_Darwin? (
@@ -48,6 +44,16 @@ src_prepare() {
 
# Needs unpackaged dwarfdump
rm test/elf/{compress-debug-sections,compressed-debug-info}.sh || die
+
+   # Sandbox sadness
+   rm test/elf/run.sh || die
+   sed -i 's|$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/{hello,ifunc}-static-pie.sh || die
+   fi
 }
 
 src_compile() {



[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2022-03-08 Thread Matthew Smith
commit: 4be88220fb4edad35bf8e8f10aa74b1fb03435b0
Author: Matthew Smith  gentoo  org>
AuthorDate: Tue Mar  8 08:17:44 2022 +
Commit: Matthew Smith  gentoo  org>
CommitDate: Tue Mar  8 08:17:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4be88220

sys-devel/mold: add 1.1.1

Signed-off-by: Matthew Smith  gentoo.org>

 sys-devel/mold/Manifest  |  1 +
 sys-devel/mold/mold-1.1.1.ebuild | 81 
 2 files changed, 82 insertions(+)

diff --git a/sys-devel/mold/Manifest b/sys-devel/mold/Manifest
index 585e6bd1feb1..5e79aa2e22f9 100644
--- a/sys-devel/mold/Manifest
+++ b/sys-devel/mold/Manifest
@@ -1,2 +1,3 @@
 DIST mold-1.0.3.tar.gz 4501162 BLAKE2B 
68db6708ae05b3a4caf19bff8b381c9a7d045b7313e15ee9c0765042ef02898404527735a8f5379a2d213a7654f656cfe24eb20497d6d4f5e9ed666988050733
 SHA512 
50b4a80c8b7a4925e6e85a35e92529867648df61ca016ee662b3fce7cf9d4a8fd717311ec0542aa594f44b49d48de34d51d7e94cae0f21bda01fdd4418990f38
+DIST mold-1.1.1.tar.gz 4530297 BLAKE2B 
78f3beee1b463b3ca028fd72ecf92deb9e8848a4f9cb07c7c549666ef3fef038f395dd30e755be2807dc504b4c3f4893ca359154de9c944c2a03e04f37f5ccea
 SHA512 
981d9737ed7a23134b9bafc04db0cd0233ab4fd588a3b250688dba64936fe84f6736168379fc3e4485273bcef11bca70e5c426b043b5d8b9775ae1cd3aea5b52
 DIST mold-1.1.tar.gz 4522886 BLAKE2B 
6c63c171a6da090c3db391fa90e0095b2ab6f995e1d23be0dd93bb3057b3b9e5f5cf1deab5c80f6db3fa58bab69195a07a7e972373b9f1e633687cb8d4d45361
 SHA512 
b8b125c77563abe2741c2f32d73ab2b12dff275b92b633fcd015336c6ea735e38e95c3d2afb50e5baace2023d4f9de3eb50d53053eabc2cd2f045110eef4cc1e

diff --git a/sys-devel/mold/mold-1.1.1.ebuild b/sys-devel/mold/mold-1.1.1.ebuild
new file mode 100644
index ..351ef38c6b51
--- /dev/null
+++ b/sys-devel/mold/mold-1.1.1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="A Modern Linker"
+HOMEPAGE="https://github.com/rui314/mold;
+if [[ ${PV} ==  ]] ; 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"
+fi
+
+LICENSE="AGPL-3"
+SLOT="0"
+
+# Try again after 1.0 (nearly there, but path-related issues)
+# https://github.com/rui314/mold/issues/137
+RESTRICT="test"
+
+RDEPEND=">=dev-cpp/tbb-2021.4.0:=
+   sys-libs/zlib
+   !kernel_Darwin? (
+   >=dev-libs/mimalloc-2:=
+   dev-libs/openssl:=
+   )"
+# As of 1.1, xxhash is now a header-only dep, but it's now bundled :(
+# TODO: restore SYSTEM_XXHASH upstream?
+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() {
+   default
+
+   # Needs unpackaged dwarfdump
+   rm test/elf/{compress-debug-sections,compressed-debug-info}.sh || die
+}
+
+src_compile() {
+   tc-export CC CXX
+
+   emake \
+   CFLAGS="${CFLAGS}" \
+   CXXFLAGS="${CXXFLAGS}" \
+   SYSTEM_TBB=1 \
+   SYSTEM_MIMALLOC=1 \
+   STRIP="true" \
+   LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+}
+
+src_test() {
+   emake \
+   SYSTEM_TBB=1 \
+   SYSTEM_MIMALLOC=1 \
+   check
+}
+
+src_install() {
+   emake \
+   SYSTEM_TBB=1 \
+   SYSTEM_MIMALLOC=1 \
+   DESTDIR="${D}" \
+   PREFIX="${EPREFIX}/usr" \
+   LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+   STRIP="true" \
+   install
+}



[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2022-02-22 Thread Matthew Smith
commit: 8a8eb5890e84734a4d152d270750406950f278c7
Author: Matthew Smith  gentoo  org>
AuthorDate: Tue Feb 22 20:35:50 2022 +
Commit: Matthew Smith  gentoo  org>
CommitDate: Tue Feb 22 21:06:16 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a8eb589

sys-devel/mold: check compiler version

Acked-by: Sam James  gentoo.org>
Closes: https://bugs.gentoo.org/831473
Closes: https://github.com/gentoo/gentoo/pull/24321
Signed-off-by: Matthew Smith  gentoo.org>

 sys-devel/mold/mold-1.0.3.ebuild | 11 +++
 sys-devel/mold/mold-1.1.ebuild   | 11 +++
 sys-devel/mold/mold-.ebuild  | 11 +++
 3 files changed, 33 insertions(+)

diff --git a/sys-devel/mold/mold-1.0.3.ebuild b/sys-devel/mold/mold-1.0.3.ebuild
index 7948bbc23805..5536efda5951 100644
--- a/sys-devel/mold/mold-1.0.3.ebuild
+++ b/sys-devel/mold/mold-1.0.3.ebuild
@@ -31,6 +31,17 @@ RDEPEND=">=dev-cpp/tbb-2021.4.0:=
)"
 DEPEND="${RDEPEND}"
 
+pkg_pretend() {
+   # Requires a c++20 compiler, see #831437
+   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() {
default
 

diff --git a/sys-devel/mold/mold-1.1.ebuild b/sys-devel/mold/mold-1.1.ebuild
index caa630e22c18..351ef38c6b51 100644
--- a/sys-devel/mold/mold-1.1.ebuild
+++ b/sys-devel/mold/mold-1.1.ebuild
@@ -32,6 +32,17 @@ RDEPEND=">=dev-cpp/tbb-2021.4.0:=
 # TODO: restore SYSTEM_XXHASH upstream?
 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() {
default
 

diff --git a/sys-devel/mold/mold-.ebuild b/sys-devel/mold/mold-.ebuild
index caa630e22c18..351ef38c6b51 100644
--- a/sys-devel/mold/mold-.ebuild
+++ b/sys-devel/mold/mold-.ebuild
@@ -32,6 +32,17 @@ RDEPEND=">=dev-cpp/tbb-2021.4.0:=
 # TODO: restore SYSTEM_XXHASH upstream?
 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() {
default
 



[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2022-02-20 Thread Matthew Smith
commit: 5cfb428eaed892f492d9cd8c7cbe2a7b9c44c5a1
Author: Matthew Smith  gentoo  org>
AuthorDate: Mon Feb 21 07:23:10 2022 +
Commit: Matthew Smith  gentoo  org>
CommitDate: Mon Feb 21 07:23:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cfb428e

sys-devel/mold: add myself as a maintainer

Signed-off-by: Matthew Smith  gentoo.org>

 sys-devel/mold/metadata.xml | 4 
 1 file changed, 4 insertions(+)

diff --git a/sys-devel/mold/metadata.xml b/sys-devel/mold/metadata.xml
index 05bec5e598ef..f8a85299d5bb 100644
--- a/sys-devel/mold/metadata.xml
+++ b/sys-devel/mold/metadata.xml
@@ -5,6 +5,10 @@
s...@gentoo.org
Sam James

+   
+   matt...@gentoo.org
+   Matthew Smith
+   

rui314/mold




[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2022-02-20 Thread Sam James
commit: 9df6c67da670972816b47909d431bd263e57b708
Author: Sam James  gentoo  org>
AuthorDate: Mon Feb 21 02:13:26 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb 21 02:13:26 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9df6c67d

sys-devel/mold: add 1.1

Signed-off-by: Sam James  gentoo.org>

 sys-devel/mold/Manifest  | 1 +
 sys-devel/mold/{mold-.ebuild => mold-1.1.ebuild} | 5 ++---
 sys-devel/mold/mold-.ebuild  | 5 ++---
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/sys-devel/mold/Manifest b/sys-devel/mold/Manifest
index 0c5e13683969..585e6bd1feb1 100644
--- a/sys-devel/mold/Manifest
+++ b/sys-devel/mold/Manifest
@@ -1 +1,2 @@
 DIST mold-1.0.3.tar.gz 4501162 BLAKE2B 
68db6708ae05b3a4caf19bff8b381c9a7d045b7313e15ee9c0765042ef02898404527735a8f5379a2d213a7654f656cfe24eb20497d6d4f5e9ed666988050733
 SHA512 
50b4a80c8b7a4925e6e85a35e92529867648df61ca016ee662b3fce7cf9d4a8fd717311ec0542aa594f44b49d48de34d51d7e94cae0f21bda01fdd4418990f38
+DIST mold-1.1.tar.gz 4522886 BLAKE2B 
6c63c171a6da090c3db391fa90e0095b2ab6f995e1d23be0dd93bb3057b3b9e5f5cf1deab5c80f6db3fa58bab69195a07a7e972373b9f1e633687cb8d4d45361
 SHA512 
b8b125c77563abe2741c2f32d73ab2b12dff275b92b633fcd015336c6ea735e38e95c3d2afb50e5baace2023d4f9de3eb50d53053eabc2cd2f045110eef4cc1e

diff --git a/sys-devel/mold/mold-.ebuild b/sys-devel/mold/mold-1.1.ebuild
similarity index 92%
copy from sys-devel/mold/mold-.ebuild
copy to sys-devel/mold/mold-1.1.ebuild
index 7948bbc23805..caa630e22c18 100644
--- a/sys-devel/mold/mold-.ebuild
+++ b/sys-devel/mold/mold-1.1.ebuild
@@ -23,12 +23,13 @@ SLOT="0"
 RESTRICT="test"
 
 RDEPEND=">=dev-cpp/tbb-2021.4.0:=
-   dev-libs/xxhash:=
sys-libs/zlib
!kernel_Darwin? (
>=dev-libs/mimalloc-2:=
dev-libs/openssl:=
)"
+# As of 1.1, xxhash is now a header-only dep, but it's now bundled :(
+# TODO: restore SYSTEM_XXHASH upstream?
 DEPEND="${RDEPEND}"
 
 src_prepare() {
@@ -46,7 +47,6 @@ src_compile() {
CXXFLAGS="${CXXFLAGS}" \
SYSTEM_TBB=1 \
SYSTEM_MIMALLOC=1 \
-   SYSTEM_XXHASH=1 \
STRIP="true" \
LIBDIR="${EPREFIX}/usr/$(get_libdir)"
 }
@@ -62,7 +62,6 @@ src_install() {
emake \
SYSTEM_TBB=1 \
SYSTEM_MIMALLOC=1 \
-   SYSTEM_XXHASH=1 \
DESTDIR="${D}" \
PREFIX="${EPREFIX}/usr" \
LIBDIR="${EPREFIX}/usr/$(get_libdir)" \

diff --git a/sys-devel/mold/mold-.ebuild b/sys-devel/mold/mold-.ebuild
index 7948bbc23805..caa630e22c18 100644
--- a/sys-devel/mold/mold-.ebuild
+++ b/sys-devel/mold/mold-.ebuild
@@ -23,12 +23,13 @@ SLOT="0"
 RESTRICT="test"
 
 RDEPEND=">=dev-cpp/tbb-2021.4.0:=
-   dev-libs/xxhash:=
sys-libs/zlib
!kernel_Darwin? (
>=dev-libs/mimalloc-2:=
dev-libs/openssl:=
)"
+# As of 1.1, xxhash is now a header-only dep, but it's now bundled :(
+# TODO: restore SYSTEM_XXHASH upstream?
 DEPEND="${RDEPEND}"
 
 src_prepare() {
@@ -46,7 +47,6 @@ src_compile() {
CXXFLAGS="${CXXFLAGS}" \
SYSTEM_TBB=1 \
SYSTEM_MIMALLOC=1 \
-   SYSTEM_XXHASH=1 \
STRIP="true" \
LIBDIR="${EPREFIX}/usr/$(get_libdir)"
 }
@@ -62,7 +62,6 @@ src_install() {
emake \
SYSTEM_TBB=1 \
SYSTEM_MIMALLOC=1 \
-   SYSTEM_XXHASH=1 \
DESTDIR="${D}" \
PREFIX="${EPREFIX}/usr" \
LIBDIR="${EPREFIX}/usr/$(get_libdir)" \



[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/, sys-devel/mold/files/

2022-02-09 Thread Sam James
commit: a254bacec24ef5bdeb2e350fa77cab786cbe20b1
Author: Sam James  gentoo  org>
AuthorDate: Thu Feb 10 07:12:57 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Feb 10 07:50:12 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a254bace

sys-devel/mold: drop 1.0.0-r1, 1.0.1-r1, 1.0.2

Signed-off-by: Sam James  gentoo.org>

 sys-devel/mold/Manifest|  3 -
 .../mold/files/mold-1.0.1-no-gold-in-version.patch | 50 ---
 sys-devel/mold/mold-1.0.0-r1.ebuild| 67 
 sys-devel/mold/mold-1.0.1-r1.ebuild| 71 --
 sys-devel/mold/mold-1.0.2.ebuild   | 71 --
 5 files changed, 262 deletions(-)

diff --git a/sys-devel/mold/Manifest b/sys-devel/mold/Manifest
index 148258091bca..0c5e13683969 100644
--- a/sys-devel/mold/Manifest
+++ b/sys-devel/mold/Manifest
@@ -1,4 +1 @@
-DIST mold-1.0.0.tar.gz 3482927 BLAKE2B 
56ebc267370548a2f91a71ebeed87871cede6f564c29dc7d44a499b95fe570f6e9c8a717baf2d9e235c7057c41e735b315493bd23d3b44574d2a44b14aaf5ef8
 SHA512 
99ffd0b9e2ff7157cc8b26808675c9d3147bf88961155ae19ed9b0ac647b7ec31ee78d05062decc6d41e66d99aa0fdc398d119803929b8dbff51eb3d077c
-DIST mold-1.0.1.tar.gz 3675262 BLAKE2B 
0e40860d3c0a221d368c94b9f58c20b245ee61de6f9eb6d1454ed3b6f103933c79ddd7358049e2aacf497221232d952c2117ba2b3371cbe37fb8ad4ae42461c2
 SHA512 
cc03a7db395362b97879c28942397d4443d12b72e067b6f979b1ece4d8aab06154b4c1a0f4c57d6ac505bcd4f892bf9a355ad281d628d4d544d8f70edaf34b72
-DIST mold-1.0.2.tar.gz 4501088 BLAKE2B 
51bac4bd44a785893c04dd03ccef6119b41a036789938a354545e7a22f16852b52079b3a3e4d27db860748e13966be18bbe813bf04b15c496f35d16ecca4b22c
 SHA512 
27f6664e63c76c32a6e3ec8bfc4b204138926001f5431be94da9ce47a5d9d3b51aa634c5cd6df45be660d52ac0507f7b7eec17134e35db402db5747d2ecc3715
 DIST mold-1.0.3.tar.gz 4501162 BLAKE2B 
68db6708ae05b3a4caf19bff8b381c9a7d045b7313e15ee9c0765042ef02898404527735a8f5379a2d213a7654f656cfe24eb20497d6d4f5e9ed666988050733
 SHA512 
50b4a80c8b7a4925e6e85a35e92529867648df61ca016ee662b3fce7cf9d4a8fd717311ec0542aa594f44b49d48de34d51d7e94cae0f21bda01fdd4418990f38

diff --git a/sys-devel/mold/files/mold-1.0.1-no-gold-in-version.patch 
b/sys-devel/mold/files/mold-1.0.1-no-gold-in-version.patch
deleted file mode 100644
index 429e55cc51a9..
--- a/sys-devel/mold/files/mold-1.0.1-no-gold-in-version.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From cea6a569afa544826c91fda7ef0f9941f50c9459 Mon Sep 17 00:00:00 2001
-From: Rui Ueyama 
-Date: Wed, 12 Jan 2022 16:31:04 +0900
-Subject: [PATCH] [ELF] Remove "GNU gold" from the --version string
-
-That substring was introduced in de7ba9014f9d9d70b9173c4bfac6c3433186ba49
-to appease Gentoo's dev-libs/jansson-2.13.1-r1 package. But I think I
-shouldn't done that from the beginning to avoid the sitaution of the
-"User-Agent" string of the web browser, which everybody claims they
-are Mozilla, AppleWebKit, Chrome and Safari simultaneously.

- main.cc | 4 ++--
- test/elf/version.sh | 6 +++---
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/main.cc b/main.cc
-index 38a41cdf..8831f7f2 100644
 a/main.cc
-+++ b/main.cc
-@@ -26,10 +26,10 @@ std::string_view errno_string() {
- 
- #ifdef GIT_HASH
- const std::string mold_version =
--  "mold " MOLD_VERSION " (" GIT_HASH "; compatible with GNU ld and GNU gold)";
-+  "mold " MOLD_VERSION " (" GIT_HASH "; compatible with GNU ld)";
- #else
- const std::string mold_version =
--  "mold " MOLD_VERSION " (compatible with GNU ld and GNU gold)";
-+  "mold " MOLD_VERSION " (compatible with GNU ld)";
- #endif
- 
- void cleanup() {
-diff --git a/test/elf/version.sh b/test/elf/version.sh
-index ae52b504..4ca576ef 100755
 a/test/elf/version.sh
-+++ b/test/elf/version.sh
-@@ -10,10 +10,10 @@ mold="$(pwd)/mold"
- t=out/test/elf/$testname
- mkdir -p $t
- 
--"$mold" -v | grep -q 'mold .*compatible with GNU ld and GNU gold'
--"$mold" --version | grep -q 'mold .*compatible with GNU ld and GNU gold'
-+"$mold" -v | grep -q 'mold .*compatible with GNU ld'
-+"$mold" --version | grep -q 'mold .*compatible with GNU ld'
- 
--"$mold" -V | grep -q 'mold .*compatible with GNU ld and GNU gold'
-+"$mold" -V | grep -q 'mold .*compatible with GNU ld'
- "$mold" -V | grep -q elf_x86_64
- "$mold" -V | grep -q elf_i386
- 

diff --git a/sys-devel/mold/mold-1.0.0-r1.ebuild 
b/sys-devel/mold/mold-1.0.0-r1.ebuild
deleted file mode 100644
index 8560f5f36a1e..
--- a/sys-devel/mold/mold-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="A Modern Linker"
-HOMEPAGE="https://github.com/rui314/mold;
-if [[ ${PV} ==  ]] ; then
-   EGIT_REPO_URI="https://github.com/rui314/mold.git;
-   inherit git-r3
-else
-   

[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2022-02-09 Thread Sam James
commit: 0330b767cb2460c4226b14efa7e1891b68ad319c
Author: Sam James  gentoo  org>
AuthorDate: Thu Feb 10 07:12:18 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Feb 10 07:50:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0330b767

sys-devel/mold: add 1.0.3

Very tiny changes but we may as well bump given it's a quick
build and to get it off the to-bump-list.

Signed-off-by: Sam James  gentoo.org>

 sys-devel/mold/Manifest  |  1 +
 sys-devel/mold/mold-1.0.3.ebuild | 71 
 2 files changed, 72 insertions(+)

diff --git a/sys-devel/mold/Manifest b/sys-devel/mold/Manifest
index 491f95001361..148258091bca 100644
--- a/sys-devel/mold/Manifest
+++ b/sys-devel/mold/Manifest
@@ -1,3 +1,4 @@
 DIST mold-1.0.0.tar.gz 3482927 BLAKE2B 
56ebc267370548a2f91a71ebeed87871cede6f564c29dc7d44a499b95fe570f6e9c8a717baf2d9e235c7057c41e735b315493bd23d3b44574d2a44b14aaf5ef8
 SHA512 
99ffd0b9e2ff7157cc8b26808675c9d3147bf88961155ae19ed9b0ac647b7ec31ee78d05062decc6d41e66d99aa0fdc398d119803929b8dbff51eb3d077c
 DIST mold-1.0.1.tar.gz 3675262 BLAKE2B 
0e40860d3c0a221d368c94b9f58c20b245ee61de6f9eb6d1454ed3b6f103933c79ddd7358049e2aacf497221232d952c2117ba2b3371cbe37fb8ad4ae42461c2
 SHA512 
cc03a7db395362b97879c28942397d4443d12b72e067b6f979b1ece4d8aab06154b4c1a0f4c57d6ac505bcd4f892bf9a355ad281d628d4d544d8f70edaf34b72
 DIST mold-1.0.2.tar.gz 4501088 BLAKE2B 
51bac4bd44a785893c04dd03ccef6119b41a036789938a354545e7a22f16852b52079b3a3e4d27db860748e13966be18bbe813bf04b15c496f35d16ecca4b22c
 SHA512 
27f6664e63c76c32a6e3ec8bfc4b204138926001f5431be94da9ce47a5d9d3b51aa634c5cd6df45be660d52ac0507f7b7eec17134e35db402db5747d2ecc3715
+DIST mold-1.0.3.tar.gz 4501162 BLAKE2B 
68db6708ae05b3a4caf19bff8b381c9a7d045b7313e15ee9c0765042ef02898404527735a8f5379a2d213a7654f656cfe24eb20497d6d4f5e9ed666988050733
 SHA512 
50b4a80c8b7a4925e6e85a35e92529867648df61ca016ee662b3fce7cf9d4a8fd717311ec0542aa594f44b49d48de34d51d7e94cae0f21bda01fdd4418990f38

diff --git a/sys-devel/mold/mold-1.0.3.ebuild b/sys-devel/mold/mold-1.0.3.ebuild
new file mode 100644
index ..7948bbc23805
--- /dev/null
+++ b/sys-devel/mold/mold-1.0.3.ebuild
@@ -0,0 +1,71 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="A Modern Linker"
+HOMEPAGE="https://github.com/rui314/mold;
+if [[ ${PV} ==  ]] ; 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"
+fi
+
+LICENSE="AGPL-3"
+SLOT="0"
+
+# Try again after 1.0 (nearly there, but path-related issues)
+# https://github.com/rui314/mold/issues/137
+RESTRICT="test"
+
+RDEPEND=">=dev-cpp/tbb-2021.4.0:=
+   dev-libs/xxhash:=
+   sys-libs/zlib
+   !kernel_Darwin? (
+   >=dev-libs/mimalloc-2:=
+   dev-libs/openssl:=
+   )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+   default
+
+   # Needs unpackaged dwarfdump
+   rm test/elf/{compress-debug-sections,compressed-debug-info}.sh || die
+}
+
+src_compile() {
+   tc-export CC CXX
+
+   emake \
+   CFLAGS="${CFLAGS}" \
+   CXXFLAGS="${CXXFLAGS}" \
+   SYSTEM_TBB=1 \
+   SYSTEM_MIMALLOC=1 \
+   SYSTEM_XXHASH=1 \
+   STRIP="true" \
+   LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+}
+
+src_test() {
+   emake \
+   SYSTEM_TBB=1 \
+   SYSTEM_MIMALLOC=1 \
+   check
+}
+
+src_install() {
+   emake \
+   SYSTEM_TBB=1 \
+   SYSTEM_MIMALLOC=1 \
+   SYSTEM_XXHASH=1 \
+   DESTDIR="${D}" \
+   PREFIX="${EPREFIX}/usr" \
+   LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+   STRIP="true" \
+   install
+}



[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2022-02-04 Thread Fabian Groffen
commit: 69b84eea11856f9627a7a0d10bf05b241df55406
Author: Fabian Groffen  gentoo  org>
AuthorDate: Fri Feb  4 11:20:47 2022 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Fri Feb  4 11:20:57 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69b84eea

sys-devel/mold: fix double Prefix, thanks Jens Lindenmeier

Closes: https://bugs.gentoo.org/832685
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Fabian Groffen  gentoo.org>

 sys-devel/mold/mold-1.0.0-r1.ebuild | 4 ++--
 sys-devel/mold/mold-1.0.1-r1.ebuild | 2 +-
 sys-devel/mold/mold-1.0.2.ebuild| 2 +-
 sys-devel/mold/mold-.ebuild | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/sys-devel/mold/mold-1.0.0-r1.ebuild 
b/sys-devel/mold/mold-1.0.0-r1.ebuild
index 767cc5c80f54..8560f5f36a1e 100644
--- a/sys-devel/mold/mold-1.0.0-r1.ebuild
+++ b/sys-devel/mold/mold-1.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -59,7 +59,7 @@ src_install() {
emake \
SYSTEM_TBB=1 \
SYSTEM_MIMALLOC=1 \
-   DESTDIR="${ED}" \
+   DESTDIR="${D}" \
PREFIX="${EPREFIX}/usr" \
LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
STRIP="true" \

diff --git a/sys-devel/mold/mold-1.0.1-r1.ebuild 
b/sys-devel/mold/mold-1.0.1-r1.ebuild
index e0cd2503b621..55ecbef5a00e 100644
--- a/sys-devel/mold/mold-1.0.1-r1.ebuild
+++ b/sys-devel/mold/mold-1.0.1-r1.ebuild
@@ -63,7 +63,7 @@ src_install() {
SYSTEM_TBB=1 \
SYSTEM_MIMALLOC=1 \
SYSTEM_XXHASH=1 \
-   DESTDIR="${ED}" \
+   DESTDIR="${D}" \
PREFIX="${EPREFIX}/usr" \
LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
STRIP="true" \

diff --git a/sys-devel/mold/mold-1.0.2.ebuild b/sys-devel/mold/mold-1.0.2.ebuild
index 3e1594e0daec..7948bbc23805 100644
--- a/sys-devel/mold/mold-1.0.2.ebuild
+++ b/sys-devel/mold/mold-1.0.2.ebuild
@@ -63,7 +63,7 @@ src_install() {
SYSTEM_TBB=1 \
SYSTEM_MIMALLOC=1 \
SYSTEM_XXHASH=1 \
-   DESTDIR="${ED}" \
+   DESTDIR="${D}" \
PREFIX="${EPREFIX}/usr" \
LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
STRIP="true" \

diff --git a/sys-devel/mold/mold-.ebuild b/sys-devel/mold/mold-.ebuild
index 3e1594e0daec..7948bbc23805 100644
--- a/sys-devel/mold/mold-.ebuild
+++ b/sys-devel/mold/mold-.ebuild
@@ -63,7 +63,7 @@ src_install() {
SYSTEM_TBB=1 \
SYSTEM_MIMALLOC=1 \
SYSTEM_XXHASH=1 \
-   DESTDIR="${ED}" \
+   DESTDIR="${D}" \
PREFIX="${EPREFIX}/usr" \
LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
STRIP="true" \



[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2022-01-23 Thread Sam James
commit: e5fb0612946492691134875e5d0b82a156f01878
Author: Sam James  gentoo  org>
AuthorDate: Sun Jan 23 15:51:13 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jan 23 15:51:21 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5fb0612

sys-devel/mold: add 1.0.2

Signed-off-by: Sam James  gentoo.org>

 sys-devel/mold/Manifest| 1 +
 sys-devel/mold/{mold-.ebuild => mold-1.0.2.ebuild} | 4 +++-
 sys-devel/mold/mold-.ebuild| 4 +++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/sys-devel/mold/Manifest b/sys-devel/mold/Manifest
index 79667690384d..491f95001361 100644
--- a/sys-devel/mold/Manifest
+++ b/sys-devel/mold/Manifest
@@ -1,2 +1,3 @@
 DIST mold-1.0.0.tar.gz 3482927 BLAKE2B 
56ebc267370548a2f91a71ebeed87871cede6f564c29dc7d44a499b95fe570f6e9c8a717baf2d9e235c7057c41e735b315493bd23d3b44574d2a44b14aaf5ef8
 SHA512 
99ffd0b9e2ff7157cc8b26808675c9d3147bf88961155ae19ed9b0ac647b7ec31ee78d05062decc6d41e66d99aa0fdc398d119803929b8dbff51eb3d077c
 DIST mold-1.0.1.tar.gz 3675262 BLAKE2B 
0e40860d3c0a221d368c94b9f58c20b245ee61de6f9eb6d1454ed3b6f103933c79ddd7358049e2aacf497221232d952c2117ba2b3371cbe37fb8ad4ae42461c2
 SHA512 
cc03a7db395362b97879c28942397d4443d12b72e067b6f979b1ece4d8aab06154b4c1a0f4c57d6ac505bcd4f892bf9a355ad281d628d4d544d8f70edaf34b72
+DIST mold-1.0.2.tar.gz 4501088 BLAKE2B 
51bac4bd44a785893c04dd03ccef6119b41a036789938a354545e7a22f16852b52079b3a3e4d27db860748e13966be18bbe813bf04b15c496f35d16ecca4b22c
 SHA512 
27f6664e63c76c32a6e3ec8bfc4b204138926001f5431be94da9ce47a5d9d3b51aa634c5cd6df45be660d52ac0507f7b7eec17134e35db402db5747d2ecc3715

diff --git a/sys-devel/mold/mold-.ebuild b/sys-devel/mold/mold-1.0.2.ebuild
similarity index 93%
copy from sys-devel/mold/mold-.ebuild
copy to sys-devel/mold/mold-1.0.2.ebuild
index 9751b231a53f..3e1594e0daec 100644
--- a/sys-devel/mold/mold-.ebuild
+++ b/sys-devel/mold/mold-1.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -42,6 +42,8 @@ src_compile() {
tc-export CC CXX
 
emake \
+   CFLAGS="${CFLAGS}" \
+   CXXFLAGS="${CXXFLAGS}" \
SYSTEM_TBB=1 \
SYSTEM_MIMALLOC=1 \
SYSTEM_XXHASH=1 \

diff --git a/sys-devel/mold/mold-.ebuild b/sys-devel/mold/mold-.ebuild
index 9751b231a53f..3e1594e0daec 100644
--- a/sys-devel/mold/mold-.ebuild
+++ b/sys-devel/mold/mold-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -42,6 +42,8 @@ src_compile() {
tc-export CC CXX
 
emake \
+   CFLAGS="${CFLAGS}" \
+   CXXFLAGS="${CXXFLAGS}" \
SYSTEM_TBB=1 \
SYSTEM_MIMALLOC=1 \
SYSTEM_XXHASH=1 \



[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/, sys-devel/mold/files/

2022-01-20 Thread Michael Orlitzky
commit: 5ad0c179fe9c6c5cbfe3edde28f2759386675bb1
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Thu Jan 20 14:37:42 2022 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Thu Jan 20 14:40:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ad0c179

sys-devel/mold: new revision sans "GNU gold" in --version.

The new mold-1.0.1-r1 includes upstream commit cea6a569afa5 which
removes the string "GNU gold" from mold's --version string. This is
necessary on Gentoo to prevent false positives from tc-ld-is-gold() in
the toolchain-funcs eclass.

Closes: https://bugs.gentoo.org/831478
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Michael Orlitzky  gentoo.org>

 .../mold/files/mold-1.0.1-no-gold-in-version.patch | 50 ++
 .../{mold-1.0.1.ebuild => mold-1.0.1-r1.ebuild}|  4 +-
 2 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/sys-devel/mold/files/mold-1.0.1-no-gold-in-version.patch 
b/sys-devel/mold/files/mold-1.0.1-no-gold-in-version.patch
new file mode 100644
index ..429e55cc51a9
--- /dev/null
+++ b/sys-devel/mold/files/mold-1.0.1-no-gold-in-version.patch
@@ -0,0 +1,50 @@
+From cea6a569afa544826c91fda7ef0f9941f50c9459 Mon Sep 17 00:00:00 2001
+From: Rui Ueyama 
+Date: Wed, 12 Jan 2022 16:31:04 +0900
+Subject: [PATCH] [ELF] Remove "GNU gold" from the --version string
+
+That substring was introduced in de7ba9014f9d9d70b9173c4bfac6c3433186ba49
+to appease Gentoo's dev-libs/jansson-2.13.1-r1 package. But I think I
+shouldn't done that from the beginning to avoid the sitaution of the
+"User-Agent" string of the web browser, which everybody claims they
+are Mozilla, AppleWebKit, Chrome and Safari simultaneously.
+---
+ main.cc | 4 ++--
+ test/elf/version.sh | 6 +++---
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/main.cc b/main.cc
+index 38a41cdf..8831f7f2 100644
+--- a/main.cc
 b/main.cc
+@@ -26,10 +26,10 @@ std::string_view errno_string() {
+ 
+ #ifdef GIT_HASH
+ const std::string mold_version =
+-  "mold " MOLD_VERSION " (" GIT_HASH "; compatible with GNU ld and GNU gold)";
++  "mold " MOLD_VERSION " (" GIT_HASH "; compatible with GNU ld)";
+ #else
+ const std::string mold_version =
+-  "mold " MOLD_VERSION " (compatible with GNU ld and GNU gold)";
++  "mold " MOLD_VERSION " (compatible with GNU ld)";
+ #endif
+ 
+ void cleanup() {
+diff --git a/test/elf/version.sh b/test/elf/version.sh
+index ae52b504..4ca576ef 100755
+--- a/test/elf/version.sh
 b/test/elf/version.sh
+@@ -10,10 +10,10 @@ mold="$(pwd)/mold"
+ t=out/test/elf/$testname
+ mkdir -p $t
+ 
+-"$mold" -v | grep -q 'mold .*compatible with GNU ld and GNU gold'
+-"$mold" --version | grep -q 'mold .*compatible with GNU ld and GNU gold'
++"$mold" -v | grep -q 'mold .*compatible with GNU ld'
++"$mold" --version | grep -q 'mold .*compatible with GNU ld'
+ 
+-"$mold" -V | grep -q 'mold .*compatible with GNU ld and GNU gold'
++"$mold" -V | grep -q 'mold .*compatible with GNU ld'
+ "$mold" -V | grep -q elf_x86_64
+ "$mold" -V | grep -q elf_i386
+ 

diff --git a/sys-devel/mold/mold-1.0.1.ebuild 
b/sys-devel/mold/mold-1.0.1-r1.ebuild
similarity index 93%
rename from sys-devel/mold/mold-1.0.1.ebuild
rename to sys-devel/mold/mold-1.0.1-r1.ebuild
index 9751b231a53f..e0cd2503b621 100644
--- a/sys-devel/mold/mold-1.0.1.ebuild
+++ b/sys-devel/mold/mold-1.0.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -31,6 +31,8 @@ RDEPEND=">=dev-cpp/tbb-2021.4.0:=
)"
 DEPEND="${RDEPEND}"
 
+PATCHES=( "${FILESDIR}/${P}-no-gold-in-version.patch" )
+
 src_prepare() {
default
 



[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2021-12-31 Thread Sam James
commit: f41ae63353c90f7f499fbd2f360a80d4e1348c64
Author: Marco Scardovi  scardovi  com>
AuthorDate: Fri Dec 31 18:24:40 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan  1 01:24:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f41ae633

sys-devel/mold: bump to 1.0.1

This release actually has supports for --defsym, plus other
useful things (see https://github.com/rui314/mold/releases/tag/v1.0.1)

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Marco Scardovi  scardovi.com>
Signed-off-by: Sam James  gentoo.org>

 sys-devel/mold/Manifest  |  1 +
 sys-devel/mold/mold-1.0.1.ebuild | 69 
 2 files changed, 70 insertions(+)

diff --git a/sys-devel/mold/Manifest b/sys-devel/mold/Manifest
index a5d35e75f69c..79667690384d 100644
--- a/sys-devel/mold/Manifest
+++ b/sys-devel/mold/Manifest
@@ -1 +1,2 @@
 DIST mold-1.0.0.tar.gz 3482927 BLAKE2B 
56ebc267370548a2f91a71ebeed87871cede6f564c29dc7d44a499b95fe570f6e9c8a717baf2d9e235c7057c41e735b315493bd23d3b44574d2a44b14aaf5ef8
 SHA512 
99ffd0b9e2ff7157cc8b26808675c9d3147bf88961155ae19ed9b0ac647b7ec31ee78d05062decc6d41e66d99aa0fdc398d119803929b8dbff51eb3d077c
+DIST mold-1.0.1.tar.gz 3675262 BLAKE2B 
0e40860d3c0a221d368c94b9f58c20b245ee61de6f9eb6d1454ed3b6f103933c79ddd7358049e2aacf497221232d952c2117ba2b3371cbe37fb8ad4ae42461c2
 SHA512 
cc03a7db395362b97879c28942397d4443d12b72e067b6f979b1ece4d8aab06154b4c1a0f4c57d6ac505bcd4f892bf9a355ad281d628d4d544d8f70edaf34b72

diff --git a/sys-devel/mold/mold-1.0.1.ebuild b/sys-devel/mold/mold-1.0.1.ebuild
new file mode 100644
index ..9751b231a53f
--- /dev/null
+++ b/sys-devel/mold/mold-1.0.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="A Modern Linker"
+HOMEPAGE="https://github.com/rui314/mold;
+if [[ ${PV} ==  ]] ; 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"
+fi
+
+LICENSE="AGPL-3"
+SLOT="0"
+
+# Try again after 1.0 (nearly there, but path-related issues)
+# https://github.com/rui314/mold/issues/137
+RESTRICT="test"
+
+RDEPEND=">=dev-cpp/tbb-2021.4.0:=
+   dev-libs/xxhash:=
+   sys-libs/zlib
+   !kernel_Darwin? (
+   >=dev-libs/mimalloc-2:=
+   dev-libs/openssl:=
+   )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+   default
+
+   # Needs unpackaged dwarfdump
+   rm test/elf/{compress-debug-sections,compressed-debug-info}.sh || die
+}
+
+src_compile() {
+   tc-export CC CXX
+
+   emake \
+   SYSTEM_TBB=1 \
+   SYSTEM_MIMALLOC=1 \
+   SYSTEM_XXHASH=1 \
+   STRIP="true" \
+   LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+}
+
+src_test() {
+   emake \
+   SYSTEM_TBB=1 \
+   SYSTEM_MIMALLOC=1 \
+   check
+}
+
+src_install() {
+   emake \
+   SYSTEM_TBB=1 \
+   SYSTEM_MIMALLOC=1 \
+   SYSTEM_XXHASH=1 \
+   DESTDIR="${ED}" \
+   PREFIX="${EPREFIX}/usr" \
+   LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+   STRIP="true" \
+   install
+}



[gentoo-commits] repo/gentoo:master commit in: sys-devel/mold/

2021-12-31 Thread Sam James
commit: e032c9030274f015da5aab20be359689088941fc
Author: Marco Scardovi  scardovi  com>
AuthorDate: Fri Dec 31 18:28:44 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan  1 01:24:34 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e032c903

sys-devel/mold: use only one .sh on rm

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Marco Scardovi  scardovi.com>
Closes: https://github.com/gentoo/gentoo/pull/23606
Signed-off-by: Sam James  gentoo.org>

 sys-devel/mold/mold-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/mold/mold-.ebuild b/sys-devel/mold/mold-.ebuild
index 30150e5e243c..9751b231a53f 100644
--- a/sys-devel/mold/mold-.ebuild
+++ b/sys-devel/mold/mold-.ebuild
@@ -35,7 +35,7 @@ src_prepare() {
default
 
# Needs unpackaged dwarfdump
-   rm test/elf/{compress-debug-sections.sh,compressed-debug-info.sh} || die
+   rm test/elf/{compress-debug-sections,compressed-debug-info}.sh || die
 }
 
 src_compile() {



  1   2   >