From 2c4f617f299650d9d3c9465a760ddfdcbdfc91ce Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 23 Mar 2026 07:33:33 +0000 Subject: [PATCH] dev-util/debugedit: Sync with Gentoo It's from Gentoo commit 6b99ff745a33d84f9748ac5781edd9d8faa996e2. Signed-off-by: Flatcar Buildbot --- .../dev-util/debugedit/Manifest | 4 +- .../debugedit/debugedit-5.1-r3.ebuild | 64 ------------------- ...ugedit-5.2.ebuild => debugedit-5.3.ebuild} | 27 ++++---- 3 files changed, 18 insertions(+), 77 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/debugedit/debugedit-5.1-r3.ebuild rename sdk_container/src/third_party/portage-stable/dev-util/debugedit/{debugedit-5.2.ebuild => debugedit-5.3.ebuild} (72%) diff --git a/sdk_container/src/third_party/portage-stable/dev-util/debugedit/Manifest b/sdk_container/src/third_party/portage-stable/dev-util/debugedit/Manifest index 7e155fd3d2..cf9bf77a39 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/debugedit/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-util/debugedit/Manifest @@ -1,4 +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 +DIST debugedit-5.3.tar.xz 206124 BLAKE2B 0b8c59249eff751e4927c2c94ce656bf112732c518702e2f41ab5c8f50393a3fed627d545dc6f4fc2164e25c58b396ea237f45669c8fb1f5e2e409325406e056 SHA512 a02e04f5b91e0ec5d880207658e5b89b28424ffee6aed7374c495c0c49b2f0180eeb2277bdb758a3d245279a2083d5f7b8b4872b8972b92d5c92ef5f1d27d958 +DIST debugedit-5.3.tar.xz.sig 119 BLAKE2B 94356067afe2185acfc6f94cbb8dec1e6fbf6a12ff66fa137cfbdebdead2f9cca9525bb63b5c8b03ff0015e38f741c7a4c01dd41d7b188dc0abf8da4cabd422e SHA512 51b04d7639b8c2eb619ce08934ea19504a3fc1d3ddf3c46bb0f3c47f1d3b18ccae7590e54b3e2a798078da879eecd50b43c1c350e6cff2564de13df8d1c7cfe7 diff --git a/sdk_container/src/third_party/portage-stable/dev-util/debugedit/debugedit-5.1-r3.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/debugedit/debugedit-5.1-r3.ebuild deleted file mode 100644 index d394aa8ded..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/debugedit/debugedit-5.1-r3.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# 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-3+ GPL-2+ LGPL-2+" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86" -#KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86" - -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 - -src_prepare() { - default - - # bashism, https://sourceware.org/bugzilla/show_bug.cgi?id=32321 - sed -i -e '/test/s:==:=:' tests/debugedit.at || die -} - -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/sdk_container/src/third_party/portage-stable/dev-util/debugedit/debugedit-5.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/debugedit/debugedit-5.3.ebuild similarity index 72% rename from sdk_container/src/third_party/portage-stable/dev-util/debugedit/debugedit-5.2.ebuild rename to sdk_container/src/third_party/portage-stable/dev-util/debugedit/debugedit-5.3.ebuild index 8afaf15c62..822ec21738 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/debugedit/debugedit-5.2.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/debugedit/debugedit-5.3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2025 Gentoo Authors +# Copyright 1999-2026 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit multiprocessing verify-sig toolchain-funcs +inherit multiprocessing optfeature verify-sig toolchain-funcs DESCRIPTION="Create debuginfo and source file distributions" HOMEPAGE="https://sourceware.org/debugedit/" @@ -14,7 +14,7 @@ SRC_URI=" LICENSE="GPL-3+ GPL-2+ LGPL-2+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" IUSE="test" RESTRICT="!test? ( test )" @@ -25,26 +25,22 @@ DEPEND=" " RDEPEND=" ${DEPEND} - sys-devel/dwz " BDEPEND=" sys-apps/help2man virtual/pkgconfig test? ( app-alternatives/cpio + dev-debug/gdb + sys-devel/dwz ) verify-sig? ( - sec-keys/openpgp-keys-debugedit + >=sec-keys/openpgp-keys-debugedit-20260311 ) " 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 @@ -54,9 +50,14 @@ src_configure() { fi local myconf=( - # avoid BDEP on dwz + # avoid bunch of BDEPs, sigh DWZ=dwz ac_cv_dwz_j=yes + HAS_CPIO=yes + HAS_EU_STRIP=yes + HAS_XZ=yes + HAS_GDB_ADD_INDEX=yes + HAS_EU_ELFLINT=yes # We don't want to effectively bundle xxhash. It fails to # build with -Og and such too (bug #956627). @@ -69,3 +70,7 @@ src_test() { local -x CCACHE_DISABLE=1 emake -Onone check TESTSUITEFLAGS="--jobs=$(get_makeopts_jobs)" } + +pkg_postinst() { + optfeature "dwz support in find-debuginfo" sys-devel/dwz +}