gentoo auto-resync : 02:12:2024 - 02:07:07

3 files changed, 117 insertions, 0 deletions

diff --git a/sys-devel/dwz/Manifest b/sys-devel/dwz/Manifest
index de30227059b7..6775ac32b25c 100644
--- a/sys-devel/dwz/Manifest
+++ b/sys-devel/dwz/Manifest
@@ -1,6 +1,8 @@
 AUX dwz-0.15-gdb-15.patch 13050 BLAKE2B 9f00c3dc0b8e8f4f64da11e41d52afe611c38ba68d4273a8fc898e090b8c02882749c1e34f4754b140702fa24e52b6d0224f7dfd39c74cacf09dabe91ef1d605 SHA512 3291a800ae771244dface7b0180d067e484c5ebbcc2082c3fd2264fe1e76147793d6ffb64827b533eb3598f27ab5c07cd307a48d538c8de018b62362f4cbfa61
+AUX dwz-0.15-readelf.patch 1464 BLAKE2B c8a3752b116f7e79bef4e477e655ee3b490f83013f57c2eaab3890b62f7981df9adb1d2d23ca7789e6c019c04ed541bb42c280c806b98738ab1423317be60b77 SHA512 c8f1fc676008d97ba1e011192a1238f67f52b44617ee6e4aea3579b97dd55fb6a5cd264ff212e55767d48e2731641f8c17339a3c964fcfcec1b86e425524c055
 DIST dwz-0.15.tar.xz 150080 BLAKE2B 4ce1722a53cb588cda8195211a26b28d69891ed32cc59e44897270298d033590c79c8c73168dc3b261cb017fc12874a9cbd50db3bfaa0aa7de8ed7cf8a588cca SHA512 43eb4b08c1f529859dc3466697d5ad7e172d6efbf21409530a67a2492ae4acc3734d5134bbd6e07c089ecc358d915871b13e22f6e4f1dd4c3af19ef804f8fcc5
 EBUILD dwz-0.15-r1.ebuild 956 BLAKE2B 3fb11a11462e40e0e0e7def587adb16c32ca1cd78b9142e0cf6534ee907473c3d4f3081e649520185bdb5cfe993ee45d330ecfda564babb76308cabe8423021e SHA512 caaf43ae1107261a09f655ad2c8fa3baa5d3081f56edad2339e1e14d0aea1d380fff36a43ba5b86f16d5f066bfc065c6800257f30bd80252f47545291f189492
 EBUILD dwz-0.15-r2.ebuild 1009 BLAKE2B 41e4456b525565f80b329324cb8b7b677aeb9cbcb58c48f6c6dacc551db25cdfa9436e66556a34141bca446bcd70e7904c3de165b3c703938d2ae7ccba8a9e1a SHA512 b2fa29bcc407fe171e1bb1852e1603c214e9d8a50d8461793cf8e819419209fbb39f433049922dec3ad3f88dafed6449a475c05f502a67dc8d038feeea127f74
+EBUILD dwz-0.15-r3.ebuild 1441 BLAKE2B 5ef84265ea0a1e085c2d3039ed50968250a687f0f652ba87146f1127526daeb7ebc2b82615532cd5e84399c669996578ec686f5a5242fe2eec8c728e8ed0ebb1 SHA512 ce81e6ed4868e394665acc09e3d6198e22ca87c4fa2315e0a75d213ece3bd2349753f8b8033bbd1a5e880c821ef7c1f82442afcfce33dfd7de43c0e02e8f3952
 EBUILD dwz-9999.ebuild 963 BLAKE2B 736f7ac3e494d12db8caa8ae9b4011d1e9ba3678fcd0375891f549ae0a00f5069d4c09432fc406d74782679076da5e434f46bffcd86343fda4379d43240210a2 SHA512 1d2526e00c53e10fd3cf1472fc83aac068870ed83afcd6e169fa86af1ac0ddb4489233df1b68024ac20df87efae3383d5af52ccd83422dd2464f340895a43c0f
 MISC metadata.xml 812 BLAKE2B abd6e645ab8cf502bfb6b90cd5712ff43d22a4e17ed7a2025bfbb16407a907b6b482497ce060ffb55b250a441fcbc495a37cb540b9d1152ed42dbdbbb4b074ca SHA512 7dea9a490d130dc0a03291b01000f38b880be517c13d762a6b6ac82e7313375c0dc5c0506ead51dd6789e72ffc612ade73e734456bfa8696777ede3f90dd6394
diff --git a/sys-devel/dwz/dwz-0.15-r3.ebuild b/sys-devel/dwz/dwz-0.15-r3.ebuild
new file mode 100644
index 000000000000..c3edf6b147e7
--- /dev/null
+++ b/sys-devel/dwz/dwz-0.15-r3.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="DWARF optimization and duplicate removal tool"
+HOMEPAGE="https://sourceware.org/dwz"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://sourceware.org/git/dwz.git"
+	inherit git-r3
+else
+	SRC_URI="https://sourceware.org/ftp/dwz/releases/${P}.tar.xz"
+	S="${WORKDIR}/${PN}"
+
+	#KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+fi
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/elfutils
+	dev-libs/xxhash
+	elibc_musl? (
+		sys-libs/error-standalone
+		sys-libs/obstack-standalone
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	test? (
+		dev-debug/gdb
+		dev-libs/elfutils[utils]
+		dev-util/dejagnu
+	)
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gdb-15.patch
+	"${FILESDIR}"/${P}-readelf.patch
+)
+
+src_prepare() {
+	default
+	tc-export CC
+}
+
+src_compile() {
+	tc-export PKG_CONFIG
+
+	export LIBS="-lelf"
+	if use elibc_musl; then
+		export CFLAGS="${CFLAGS} $(${PKG_CONFIG} --cflags obstack-standalone)"
+		export LIBS="${LIBS} $(${PKG_CONFIG} --libs obstack-standalone)"
+	fi
+
+	emake CFLAGS="${CFLAGS}" LIBS="${LIBS}" srcdir="${S}"
+}
+
+src_test() {
+	emake CFLAGS="${CFLAGS}" LIBS="${LIBS}" srcdir="${S}" check
+}
+
+src_install() {
+	emake DESTDIR="${D}" CFLAGS="${CFLAGS}" LIBS="${LIBS}" srcdir="${S}" install
+}
diff --git a/sys-devel/dwz/files/dwz-0.15-readelf.patch b/sys-devel/dwz/files/dwz-0.15-readelf.patch
new file mode 100644
index 000000000000..038c832e3950
--- /dev/null
+++ b/sys-devel/dwz/files/dwz-0.15-readelf.patch
@@ -0,0 +1,43 @@
+From 2ae1b0ee518ba40fe985aa644d3a66ebca1165e4 Mon Sep 17 00:00:00 2001
+From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
+Upstream: https://sourceware.org/pipermail/dwz/2024q4/001435.html
+Date: Fri, 22 Nov 2024 07:33:09 +0100
+Subject: [PATCH 2/2] Makefile: use $READELF variable instead of hardcoding
+ 'readelf'
+
+---
+ Makefile | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 3dc6c6f..f0841aa 100644
+--- a/Makefile
++++ b/Makefile
+@@ -19,6 +19,8 @@ endif
+ 
+ override CFLAGS += $(CFLAGS_COMMON) $(CFLAGS_VERSION) $(CFLAGS_COPYRIGHT)
+ 
++READELF ?= $(CROSS_COMPILE)readelf
++
+ prefix = /usr
+ exec_prefix = $(prefix)
+ bindir = $(exec_prefix)/bin
+@@ -35,13 +37,13 @@ args.o: native.o
+ args.o: CFLAGS_FOR_SOURCE = \
+ 	-DNATIVE_ENDIAN_VAL=$(NATIVE_ENDIAN_VAL) \
+ 	-DNATIVE_POINTER_SIZE=$(NATIVE_POINTER_SIZE)
+-NATIVE_ENDIAN=$(shell readelf -h native.o \
++NATIVE_ENDIAN=$(shell ${READELF} -h native.o \
+ 	| grep Data \
+ 	| sed 's/.*, //;s/ endian//')
+ NATIVE_ENDIAN_LITTLE=$(findstring $(NATIVE_ENDIAN),$(findstring little,$(NATIVE_ENDIAN)))
+ NATIVE_ENDIAN_BIG=$(findstring $(NATIVE_ENDIAN),$(findstring big,$(NATIVE_ENDIAN)))
+ NATIVE_ENDIAN_VAL=$(if $(NATIVE_ENDIAN_LITTLE),ELFDATA2LSB,$(if $(NATIVE_ENDIAN_BIG),ELFDATA2MSB,ELFDATANONE))
+-NATIVE_POINTER_SIZE=$(shell readelf -wi native.o \
++NATIVE_POINTER_SIZE=$(shell ${READELF} -wi native.o \
+ 	| grep "Pointer Size:" \
+ 	| sed 's/.*: *//')
+ %.o: %.c
+-- 
+2.45.2
+