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

["Sam James" <sam@gentoo.org>]

commit:     7de18053c3711a2ded06d55c4523305eb2ba4bd0
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 20 05:08:24 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Dec 20 05:08:29 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7de18053

sys-devel/mold: drop 0.9.6-r3

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-devel/mold/Manifest                            |  1 -
 .../mold/files/mold-0.9.6-fix-libdir-wrapper.patch | 26 ------
 .../mold/files/mold-0.9.6-respect-flags.patch      | 49 -----------
 sys-devel/mold/mold-0.9.6-r3.ebuild                | 98 ----------------------
 4 files changed, 174 deletions(-)

diff --git a/sys-devel/mold/Manifest b/sys-devel/mold/Manifest
index c1c71b4a9882..a5d35e75f69c 100644
--- a/sys-devel/mold/Manifest
+++ b/sys-devel/mold/Manifest
@@ -1,2 +1 @@
-DIST mold-0.9.6.tar.gz 3378698 BLAKE2B 1352e4f2bc018b53f6f18f6412c4747660a808a896d0c5c620db64babe42a6a949ca444f14a426a41202c8e26ff5973996819c6e4778eeaff6cb20b5746deb0d SHA512 d3de30b371413e974728fba03958d6043026f59aead8371058a0b1dc672e2675e169a1def3afd3751058f529d6ec80ff78c773d2718c1d9f0bdea74d9f13bc2e
 DIST mold-1.0.0.tar.gz 3482927 BLAKE2B 56ebc267370548a2f91a71ebeed87871cede6f564c29dc7d44a499b95fe570f6e9c8a717baf2d9e235c7057c41e735b315493bd23d3b44574d2a44b14aaf5ef8 SHA512 99ffd0b9e2ff7157cc8b26808675c9d3147bf88961155ae19ed9b99990ac647b7ec31ee78d05062decc6d41e66d99aa0fdc398d119803929b8dbff51eb3d077c

diff --git a/sys-devel/mold/files/mold-0.9.6-fix-libdir-wrapper.patch b/sys-devel/mold/files/mold-0.9.6-fix-libdir-wrapper.patch
deleted file mode 100644
index d8155cde8f58..000000000000
--- a/sys-devel/mold/files/mold-0.9.6-fix-libdir-wrapper.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Should be fixed with a LIBDIR variable in the next release.
-
-https://bugs.gentoo.org/823653
-https://github.com/rui314/mold/issues/127
---- a/elf/subprocess.cc
-+++ b/elf/subprocess.cc
-@@ -267,18 +267,7 @@
- 
- template <typename E>
- std::string find_dso(Context<E> &ctx, const std::string &self) {
--  // Look for mold-wrapper.so from the same directory as the executable is.
--  std::string path = std::string(path_dirname(self)) + "/mold-wrapper.so";
--  if (is_regular_file(path))
--    return path;
--
--  // If not exist, mold might be installed as $PREFIX/bin/mold and the
--  // DSO as $PREFIX/lib/mold/mold-wrapper.so.
--  path = path_clean(self + "/../../lib/mold/mold-wrapper.so");
--  if (is_regular_file(path))
--    return path;
--
--  Fatal(ctx) << "mold-wrapper.so is missing";
-+  return "/usr/lib64/mold/mold-wrapper.so";
- }
- 
- template <typename E>

diff --git a/sys-devel/mold/files/mold-0.9.6-respect-flags.patch b/sys-devel/mold/files/mold-0.9.6-respect-flags.patch
deleted file mode 100644
index 270a28988f9d..000000000000
--- a/sys-devel/mold/files/mold-0.9.6-respect-flags.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From: Sam James <sam@gentoo.org>
-Date: Fri, 29 Oct 2021 22:50:40 +0100
-Subject: [PATCH] Respect *FLAGS
-
---- a/Makefile
-+++ b/Makefile
-@@ -10,10 +10,11 @@ GIT_HASH ?= $(shell [ -d .git ] && git rev-parse HEAD)
- 
- OS ?= $(shell uname -s)
- 
--CPPFLAGS = -g -pthread -std=c++20 -fPIE \
--           -DMOLD_VERSION=\"0.9.6\" \
--           -DGIT_HASH=\"$(GIT_HASH)\" \
--	   $(EXTRA_CPPFLAGS)
-+CFLAGS = -pthread -fPIE $(EXTRA_CFLAGS)
-+CXXFLAGS = -pthread -std=c++20 -fPIE $(EXTRA_CXXFLAGS)
-+CPPFLAGS = -DMOLD_VERSION=\"0.9.6\" \
-+		-DGIT_HASH=\"$(GIT_HASH)\" \
-+		$(EXTRA_CPPFLAGS)
- LDFLAGS += $(EXTRA_LDFLAGS)
- LIBS = -pthread -lz -lxxhash -ldl -lm
- 
-@@ -28,12 +29,6 @@ LTO ?= 0
- ASAN ?= 0
- TSAN ?= 0
- 
--ifeq ($(DEBUG), 1)
--  CPPFLAGS += -O0
--else
--  CPPFLAGS += -O2
--endif
--
- ifeq ($(LTO), 1)
-   CPPFLAGS += -flto -O3
-   LDFLAGS  += -flto
-@@ -73,11 +68,11 @@ endif
- all: mold mold-wrapper.so
- 
- mold: $(OBJS) $(MIMALLOC_LIB) $(TBB_LIB)
--	$(CXX) $(CXXFLAGS) $(OBJS) -o $@ $(LDFLAGS) $(LIBS)
-+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $(OBJS) -o $@ $(LIBS)
- 	ln -sf mold ld
- 
- mold-wrapper.so: elf/mold-wrapper.c Makefile
--	$(CC) -fPIC -shared -o $@ $< -ldl
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -fPIC -shared -o $@ $(LDFLAGS) $< -ldl
- 
- $(OBJS): $(HEADERS) Makefile
- 

diff --git a/sys-devel/mold/mold-0.9.6-r3.ebuild b/sys-devel/mold/mold-0.9.6-r3.ebuild
deleted file mode 100644
index 3baea582d9ec..000000000000
--- a/sys-devel/mold/mold-0.9.6-r3.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# 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} == 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"
-
-# Try again after 0.9.6
-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}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.9.6-respect-flags.patch
-	"${FILESDIR}"/${PN}-0.9.6-fix-libdir-wrapper.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e '/	strip/d' \
-		-e '/	gzip/d' \
-		-e "s:\$(DEST)/lib:\$(DEST)/$(get_libdir):" \
-		Makefile || die
-
-	# Drop on next release: bug #823653
-	# https://github.com/rui314/mold/issues/127
-	sed -i \
-		-e "s:/usr/lib64/mold/mold-wrapper.so:${EPREFIX}/usr/$(get_libdir)/mold/mold-wrapper.so:" \
-		elf/subprocess.cc || die
-
-	# Needs unpackaged dwarfutils
-	rm test/compressed-debug-info.sh \
-		test/compress-debug-sections.sh || die
-
-	# Seems to have been fixed in git (> 0.9.6)
-	# Broken atm?
-	rm test/mold-wrapper.sh || die
-
-	# Needs llvmgold
-	rm test/hello-static.sh || die
-}
-
-src_compile() {
-	tc-export CC CXX
-
-	emake \
-		SYSTEM_TBB=1 \
-		SYSTEM_MIMALLOC=1 \
-		EXTRA_CFLAGS="${CFLAGS}" \
-		EXTRA_CXXFLAGS="${CXXFLAGS}" \
-		EXTRA_CPPFLAGS="${CPPFLAGS}" \
-		EXTRA_LDFLAGS="${LDFLAGS}"
-}
-
-src_test() {
-	emake \
-		SYSTEM_TBB=1 \
-		SYSTEM_MIMALLOC=1 \
-		EXTRA_CFLAGS="${CFLAGS}" \
-		EXTRA_CXXFLAGS="${CXXFLAGS}" \
-		EXTRA_CPPFLAGS="${CPPFLAGS}" \
-		EXTRA_LDFLAGS="${LDFLAGS}" \
-		check
-}
-
-src_install() {
-	emake \
-		SYSTEM_TBB=1 \
-		SYSTEM_MIMALLOC=1 \
-		EXTRA_CFLAGS="${CFLAGS}" \
-		EXTRA_CXXFLAGS="${CXXFLAGS}" \
-		EXTRA_CPPFLAGS="${CPPFLAGS}" \
-		EXTRA_LDFLAGS="${LDFLAGS}" \
-		DESTDIR="${ED}" \
-		install
-}