From 1f0cab2a15545aedc79f5f932ba64e89d63b4522 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 4 Mar 2024 07:56:46 +0000 Subject: [PATCH] dev-libs/libgpg-error: Sync with Gentoo It's from Gentoo commit 52238395b6596aeb0d2f33ec872539c21bf741c3. --- .../dev-libs/libgpg-error/Manifest | 2 ++ ...ibgpg-error-1.48-remove_broken_check.patch | 20 +++++++++++++++++++ ...r-1.47.ebuild => libgpg-error-1.48.ebuild} | 10 +++++----- 3 files changed, 27 insertions(+), 5 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libgpg-error/files/libgpg-error-1.48-remove_broken_check.patch rename sdk_container/src/third_party/portage-stable/dev-libs/libgpg-error/{libgpg-error-1.47.ebuild => libgpg-error-1.48.ebuild} (85%) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libgpg-error/Manifest b/sdk_container/src/third_party/portage-stable/dev-libs/libgpg-error/Manifest index d4f01bcd4f..24f9363b02 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libgpg-error/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libgpg-error/Manifest @@ -1,2 +1,4 @@ DIST libgpg-error-1.47.tar.bz2 1020862 BLAKE2B bc04efa0686b1b7d7cdce045fc080c090c1abec60349b673c2e1ce27900483aea090eb6ebcb3fb49a4eed36f18156a12413d5446f739475632f4ed2a2481ff27 SHA512 bbb4b15dae75856ee5b1253568674b56ad155524ae29a075cb5b0a7e74c4af685131775c3ea2226fff2f84ef80855e77aa661645d002b490a795c7ae57b66a30 DIST libgpg-error-1.47.tar.bz2.sig 119 BLAKE2B d23ea6c38621407c8f9f0c6bde71abd0e50c136d2e5de9a6cef64627f5d398c344a3438995a2405c4ef148ad8638ef7125f34670819957acd7d597370f1630e5 SHA512 09343016eaf7fcc455f8ce533847153a8a9b7c36f375a8ebe71ef5fc2923edf7b70842f834f52c51874e427869487b74a2286ea0112cffad0d72f79cb6d4eceb +DIST libgpg-error-1.48.tar.bz2 1080417 BLAKE2B 4ced63058586558f4d001bcc468f4bd419b8ec29fbd7dbcaa1a21f959d847c9e12c10c548a0038fd4eac0bdfc9907b61e9f6be71c95fc61c964c649e2415dfd7 SHA512 3e9ea99cfb7d706791eb3349a9356b6bc44a53ef8bfa9a4e89afb5203dad5af3f466a039a1764361c0c7f697a6fa668a21d05ceaeb8e44ec5a11d6468998adf2 +DIST libgpg-error-1.48.tar.bz2.sig 119 BLAKE2B 36e74c520df1740d48630584cb7093413c7974157038dd0e732cb821d6e3b3386a331be9e94a7f19ea10256bd2902d778d52fe1eeab68065ef9dc2625ac2902c SHA512 302091beddab877acf4355f913fae4bd0a795f0a032f47e0e17c58fe1049833116a743d3470669cff59eab2f6d184b143689763cbb4d0f2f9bcab598e09dc12c diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libgpg-error/files/libgpg-error-1.48-remove_broken_check.patch b/sdk_container/src/third_party/portage-stable/dev-libs/libgpg-error/files/libgpg-error-1.48-remove_broken_check.patch new file mode 100644 index 0000000000..7ccdb2223a --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libgpg-error/files/libgpg-error-1.48-remove_broken_check.patch @@ -0,0 +1,20 @@ +This breaks our multilib builds: + + Confirm gpg-error-config works... no + *** Please report to with gpg-error-config-test.log + +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -318,12 +318,4 @@ gpgrt.h: gpg-error.h + cp gpg-error.h gpgrt.h + + gpg-error-config: gpgrt-config gpg-error-config-old gpg-error-config-test.sh +- @echo $(ECHO_N) "Confirm gpg-error-config works... $(ECHO_C)" +- @if ./gpg-error-config-test.sh --old-new; then \ +- echo "good"; \ +- else \ +- echo "no"; \ +- echo "*** Please report to with gpg-error-config-test.log"; \ +- exit 1; \ +- fi + cp gpg-error-config-old $@ diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libgpg-error/libgpg-error-1.47.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libgpg-error/libgpg-error-1.48.ebuild similarity index 85% rename from sdk_container/src/third_party/portage-stable/dev-libs/libgpg-error/libgpg-error-1.47.ebuild rename to sdk_container/src/third_party/portage-stable/dev-libs/libgpg-error/libgpg-error-1.48.ebuild index 16e9fc1902..0939b629b2 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libgpg-error/libgpg-error-1.47.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libgpg-error/libgpg-error-1.48.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -10,7 +10,7 @@ EAPI=8 # any subsequent ones linked within so you're covered for a while.) VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/gnupg.asc -inherit autotools multilib-minimal toolchain-funcs prefix verify-sig +inherit autotools multilib-minimal toolchain-funcs verify-sig DESCRIPTION="Contains error handling functions used by GnuPG software" HOMEPAGE="https://www.gnupg.org/related_software/libgpg-error" @@ -19,7 +19,7 @@ SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )" LICENSE="GPL-2 LGPL-2.1" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="common-lisp nls static-libs test" RESTRICT="!test? ( test )" @@ -41,7 +41,7 @@ MULTILIB_CHOST_TOOLS=( ) PATCHES=( - "${FILESDIR}/${PN}-1.44-remove_broken_check.patch" + "${FILESDIR}/${PN}-1.48-remove_broken_check.patch" ) src_prepare() { @@ -55,7 +55,7 @@ src_prepare() { # only necessary for as long as we run eautoreconf, configure.ac # uses ./autogen.sh to generate PACKAGE_VERSION, but autogen.sh is # not a pure /bin/sh script, so it fails on some hosts - hprefixify -w 1 autogen.sh + sed -i -e "1s:.*:#\!${BASH}:" autogen.sh || die eautoreconf }