commit: 9e96e2afe78812f3893829938d9af7f200254f11 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Aug 17 19:56:55 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Aug 17 19:57:01 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e96e2af
dev-util/debugedit: add 5.2 I see some test failures but they're not consistent and I see them with 5.1 too. I'll speak to mjw when I get a chance to see if he has any ideas. Signed-off-by: Sam James <sam <AT> gentoo.org> dev-util/debugedit/Manifest | 2 + dev-util/debugedit/debugedit-5.2.ebuild | 62 ++++++++++++++++++++++ .../debugedit/files/debugedit-5.2-bashism.patch | 35 ++++++++++++ .../debugedit/files/debugedit-5.2-buildid.patch | 37 +++++++++++++ 4 files changed, 136 insertions(+) diff --git a/dev-util/debugedit/Manifest b/dev-util/debugedit/Manifest index 30ec4ef83593..7e155fd3d283 100644 --- a/dev-util/debugedit/Manifest +++ b/dev-util/debugedit/Manifest @@ -1,2 +1,4 @@ DIST debugedit-5.1.tar.xz 186320 BLAKE2B 21117429cda436ef73d5b713596380558bf0cfbe1feae85c9d31a4dddce0a7a4a1ca89608c547954afd6066722aff5d048bffde79489b873df3b63ce2553dc3a SHA512 72f4dcc0fba223a85d261aa38400e229f04c7c96adafe455919a8f702d3d7d9cdfb991b403d53f2ac4948ca19eeb43d3d49c0ea2616065657c120647a30575d3 DIST debugedit-5.1.tar.xz.sig 310 BLAKE2B c8975b2a1a9fdfdaac01674aebf76df9dd93a59469d5660d857b2f7c71e6eb5fa1a79d09ab057e2c0050f6cd566c3ebe953e4581bffbdd2003fd45e34a97d4a9 SHA512 8fc5072f05df2df630994844bd758dece9479c5f68182c10fd7ba4bc1c9a9601f6e399a2ad3146e58cdef75aa36871b642b64cb53c42cedfb05b310773994e5f +DIST debugedit-5.2.tar.xz 196724 BLAKE2B ced3d1ff03f06cc2411627067c3e194951793b230fb37ac8f2528c6dd898841ca452b0f86107de3830c03123d34987c42a0427e40c579d775764bf5b09180410 SHA512 0fe21d7576ca8ea8067f6afe5c02807ace77051249d8911531e6f9d077db59487ee29dfbdb5e9c80aebaa8bd22c6efe515d25a502d614bc058f24d174c7ebe4b +DIST debugedit-5.2.tar.xz.sig 310 BLAKE2B 599db2dfb9a85a70dff9aadf606f6eb308246e1628ca465ba7d58fb73842ed9c4b4e27ee23818d968c8fd7314678b7bb63ba1f77ad94bb7ed15e8f0d4bd94ee3 SHA512 5c80ea4b43e1363399b858a0758e944f49cedf50828f60867651f65e5469d217e7a6b4ac790266016ed5eb512ae7af67690d99ea020d8497b8289c3a88c9908d diff --git a/dev-util/debugedit/debugedit-5.2.ebuild b/dev-util/debugedit/debugedit-5.2.ebuild new file mode 100644 index 000000000000..5bda18a844b7 --- /dev/null +++ b/dev-util/debugedit/debugedit-5.2.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit multiprocessing verify-sig toolchain-funcs + +DESCRIPTION="Create debuginfo and source file distributions" +HOMEPAGE="https://sourceware.org/debugedit/"; +SRC_URI=" + https://sourceware.org/ftp/debugedit/${PV}/${P}.tar.xz + verify-sig? ( https://sourceware.org/ftp/debugedit/${PV}/${P}.tar.xz.sig ) +" + +LICENSE="GPL-2+ LGPL-2+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +#KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" + +DEPEND=" + >=dev-libs/elfutils-0.176-r1:= + >=dev-libs/xxhash-0.8:= + elibc_musl? ( >=sys-libs/error-standalone-2.0 ) +" +RDEPEND=" + ${DEPEND} + sys-devel/dwz +" +BDEPEND=" + sys-apps/help2man + virtual/pkgconfig + verify-sig? ( + sec-keys/openpgp-keys-debugedit + ) +" + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/debugedit.gpg + +PATCHES=( + "${FILESDIR}"/${P}-bashism.patch + "${FILESDIR}"/${P}-buildid.patch +) + +src_configure() { + tc-export PKG_CONFIG + + if use elibc_musl; then + export CFLAGS="${CFLAGS} $(${PKG_CONFIG} --cflags error-standalone)" + export LIBS="${LIBS} $(${PKG_CONFIG} --libs error-standalone)" + fi + + local myconf=( + # avoid BDEP on dwz + DWZ=dwz + ac_cv_dwz_j=yes + ) + econf "${myconf[@]}" +} + +src_test() { + emake -Onone check TESTSUITEFLAGS="--jobs=$(get_makeopts_jobs)" +} diff --git a/dev-util/debugedit/files/debugedit-5.2-bashism.patch b/dev-util/debugedit/files/debugedit-5.2-bashism.patch new file mode 100644 index 000000000000..8f5bd0eac227 --- /dev/null +++ b/dev-util/debugedit/files/debugedit-5.2-bashism.patch @@ -0,0 +1,35 @@ +https://sourceware.org/cgit/debugedit/commit/?id=40b9c550dd2f94a069f3bedf51ceb310d7487d88 + +From 40b9c550dd2f94a069f3bedf51ceb310d7487d88 Mon Sep 17 00:00:00 2001 +From: Michał Górny <[email protected]> +Date: Tue, 8 Jul 2025 07:40:20 +0200 +Subject: tests/debugedit.at: Replace 'type -p' bashism +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Replace 'type -p' with more portable 'command -v', in order to fix +running the test suite on non-bash shells. Note that while the test +itself invokes bash, the backticks are evaluated within the context +of the shell used by autotest. + +Signed-off-by: Michał Górny <[email protected]> +--- + tests/find-debuginfo.at | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/find-debuginfo.at b/tests/find-debuginfo.at +index 5552ce1..dd59374 100644 +--- a/tests/find-debuginfo.at ++++ b/tests/find-debuginfo.at +@@ -67,7 +67,7 @@ AT_CHECK([$READELF --debug-dump=line subdir_build/dupes.a | grep `pwd`], [0], [s + + # run conversion, under bash -x tracing for fuller testing log + AT_CHECK([[env RPM_BUILD_DIR=${PWD} RPM_BUILD_ROOT=${PWD} RPM_PACKAGE_NAME=pkg RPM_PACKAGE_VERSION=ver RPM_PACKAGE_RELEASE=rel RPM_ARCH=arch \ +- bash -x `type -p find-debuginfo` -S sourcefiles.list -v ${PWD}/subdir_build]], [0], [stdout], [ignore]) ++ bash -x `command -v find-debuginfo` -S sourcefiles.list -v ${PWD}/subdir_build]], [0], [stdout], [ignore]) + + # list new .a contents; ar tPv contains timestamps / subdirs, so not a good fit for AT_DATA() here + AT_CHECK([$AR tPv subdir_build/dupes.a],[0],[stdout],[ignore]) +-- +cgit diff --git a/dev-util/debugedit/files/debugedit-5.2-buildid.patch b/dev-util/debugedit/files/debugedit-5.2-buildid.patch new file mode 100644 index 000000000000..09875de16522 --- /dev/null +++ b/dev-util/debugedit/files/debugedit-5.2-buildid.patch @@ -0,0 +1,37 @@ +https://sourceware.org/cgit/debugedit/commit/?id=c011f478dca2c89d52958a8999b99663d14db85d + +From c011f478dca2c89d52958a8999b99663d14db85d Mon Sep 17 00:00:00 2001 +From: Mark Wielaard <[email protected]> +Date: Tue, 8 Jul 2025 13:05:37 +0200 +Subject: find-debuginfo.at: Make sure foo, bar and baz have build-ids + +There are still distros that don't configure gcc with +--enable-linker-build-id. So explicitly add -Wl,--build-id +to the test binaries generated. + +https://sourceware.org/bugzilla/show_bug.cgi?id=33135 + +Signed-off-by: Mark Wielaard <[email protected]> +--- + tests/find-debuginfo.at | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/tests/find-debuginfo.at b/tests/find-debuginfo.at +index dd59374..1d7ad57 100644 +--- a/tests/find-debuginfo.at ++++ b/tests/find-debuginfo.at +@@ -93,9 +93,9 @@ cp "${abs_srcdir}"/data/SOURCES/baz.c subdir_build + cd subdir_build + # Three almost identical binaries + # so dwz has something to put into the alt file +-$CC $CFLAGS -g3 -I. -o foo foo.c bar.c baz.c +-$CC $CFLAGS -g3 -I. -o bar bar.c baz.c foo.c +-$CC $CFLAGS -g3 -I. -o baz baz.c foo.c bar.c ++$CC $CFLAGS -Wl,--build-id -g3 -I. -o foo foo.c bar.c baz.c ++$CC $CFLAGS -Wl,--build-id -g3 -I. -o bar bar.c baz.c foo.c ++$CC $CFLAGS -Wl,--build-id -g3 -I. -o baz baz.c foo.c bar.c + cd .. + ]]) + +-- +cgit
