gentoo resync : 16.04.2022

3 files changed, 97 insertions, 2 deletions

diff --git a/sys-devel/mold/Manifest b/sys-devel/mold/Manifest
index 2ae10e64a532..6daf31e37a59 100644
--- a/sys-devel/mold/Manifest
+++ b/sys-devel/mold/Manifest
@@ -1,4 +1,6 @@
 DIST mold-1.1.1.tar.gz 4530297 BLAKE2B 78f3beee1b463b3ca028fd72ecf92deb9e8848a4f9cb07c7c549666ef3fef038f395dd30e755be2807dc504b4c3f4893ca359154de9c944c2a03e04f37f5ccea SHA512 981d9737ed7a23134b9bafc04db0cd0233ab4fd588a3b250688dba64936fe84f6736168379fc3e4485273bcef11bca70e5c426b043b5d8b9775ae1cd3aea5b52
+DIST mold-1.2.tar.gz 4759743 BLAKE2B 496a4804ac656d52cf54675740091a5e50048a2cc0aae9eab17a08ae88b16e138c364bf76c4d7959cf631d42ed69df3b18207620bf33f6675477ef38bbb0a016 SHA512 1308f5f274867a5d2d2c000a043ce645eff2a0c876fc1bec33c077cd7f5fc0f1f2b983211ca479cebc80f1ed3f3b0ea0d4c8f7e3e7f2124b713354b18ebc8676
 EBUILD mold-1.1.1.ebuild 1899 BLAKE2B 537010414a43b9c333994f779f3cb3d9b006515ec924a5da27d0320669e6b80b3360c5270a607cb67a4d4e449dc971bf079e4cdcbb72a2a20cd29cf085b54ee2 SHA512 8f7b7271adb44c0317a5e8b1f336eb105504edc63dd9934abc9c817631589959a395d2f6f3ee09735239d7a32c17a1301b4b22775bc30c277f31bd20521c88fa
-EBUILD mold-9999.ebuild 1899 BLAKE2B 537010414a43b9c333994f779f3cb3d9b006515ec924a5da27d0320669e6b80b3360c5270a607cb67a4d4e449dc971bf079e4cdcbb72a2a20cd29cf085b54ee2 SHA512 8f7b7271adb44c0317a5e8b1f336eb105504edc63dd9934abc9c817631589959a395d2f6f3ee09735239d7a32c17a1301b4b22775bc30c277f31bd20521c88fa
+EBUILD mold-1.2.ebuild 1966 BLAKE2B 64888a2c9ba37c9c43d656a4cff2173127793b149878cd0ed6d577c4de03d1ac752bdf2804c36112785b2726c0a22df6caa3121bd3d503b1ddcf67d38c86c714 SHA512 f373d1e090b165a728ae132a1aa175b8b3805593c96a1fc64b9a3df139aad930a3d4eee4e5c695f7e31ffca5ff84385b02192283b2cd95a52619849203f2b7bb
+EBUILD mold-9999.ebuild 1966 BLAKE2B 64888a2c9ba37c9c43d656a4cff2173127793b149878cd0ed6d577c4de03d1ac752bdf2804c36112785b2726c0a22df6caa3121bd3d503b1ddcf67d38c86c714 SHA512 f373d1e090b165a728ae132a1aa175b8b3805593c96a1fc64b9a3df139aad930a3d4eee4e5c695f7e31ffca5ff84385b02192283b2cd95a52619849203f2b7bb
 MISC metadata.xml 424 BLAKE2B a1c0cbdcb86c323fa1e6143c9665ec548f7713e74002a25b2fc26c51b60dae00922d3448a5aaecd5027a8cb026a681386ca7dea90657a3e10b25fb194dafc0d3 SHA512 1adc934e78ca0210743a1aa7479ebc4b5ea0b66a348c4408423460f02b404b885d3a8eca6e89ea8ac53ac9c76e85116965f1eef79e3f3e1f0451c8cf5ce0dfd6
diff --git a/sys-devel/mold/mold-1.2.ebuild b/sys-devel/mold/mold-1.2.ebuild
new file mode 100644
index 000000000000..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} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/rui314/mold.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/rui314/mold/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+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
+}
diff --git a/sys-devel/mold/mold-9999.ebuild b/sys-devel/mold/mold-9999.ebuild
index 5ea54e0926db..83ebef232694 100644
--- a/sys-devel/mold/mold-9999.ebuild
+++ b/sys-devel/mold/mold-9999.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