From fb3c269231674e485be1692fc4b7bb342a0b703a Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 4 Sep 2023 07:09:45 +0000 Subject: [PATCH] app-crypt/rhash: Sync with Gentoo It's from Gentoo commit 74c411795d3f134255c42bfcd3f6863eda2a0517. --- .../rhash/files/rhash-1.4.4-prefix.patch | 22 +++++++++++++++++++ .../app-crypt/rhash/rhash-1.4.4.ebuild | 4 ++++ 2 files changed, 26 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/rhash/files/rhash-1.4.4-prefix.patch diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/rhash/files/rhash-1.4.4-prefix.patch b/sdk_container/src/third_party/portage-stable/app-crypt/rhash/files/rhash-1.4.4-prefix.patch new file mode 100644 index 0000000000..ce2e72bf14 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-crypt/rhash/files/rhash-1.4.4-prefix.patch @@ -0,0 +1,22 @@ +From c804982d1b24c6533118b3068d2cfdca685076f3 Mon Sep 17 00:00:00 2001 +From: Aleksey Kravchenko +Date: Mon, 7 Aug 2023 01:00:37 +0300 +Subject: [PATCH] Fix #243: Incorrect assigment in the configure script + +--- + configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure b/configure +index 39ef8c1b..63cbd8d0 100755 +--- a/configure ++++ b/configure +@@ -877,7 +877,7 @@ if test "$OPT_STATIC" = "no"; then + RHASH_TEST_OPTIONS=--shared + test "$INSTALL_LIB_SHARED" = "auto" && INSTALL_LIB_SHARED=yes + test "$INSTALL_LIB_STATIC" = "yes" && RHASH_BUILD_TARGETS="$RHASH_BUILD_TARGETS \$(LIBRHASH_STATIC)" +- RHASH_LDFLAGS=$RHASH_LDFLAGS $GETTEXT_LDFLAGS ++ RHASH_LDFLAGS=$(join_params $RHASH_LDFLAGS $GETTEXT_LDFLAGS) + else + LIBRHASH_TYPE=static + LIBRHASH_PATH="\$(LIBRHASH_STATIC)" diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/rhash/rhash-1.4.4.ebuild b/sdk_container/src/third_party/portage-stable/app-crypt/rhash/rhash-1.4.4.ebuild index b56bd78dac..165ca9e3ba 100644 --- a/sdk_container/src/third_party/portage-stable/app-crypt/rhash/rhash-1.4.4.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-crypt/rhash/rhash-1.4.4.ebuild @@ -29,6 +29,10 @@ BDEPEND=" S="${WORKDIR}/RHash-${PV}" +PATCHES=( + "${FILESDIR}"/${P}-prefix.patch +) + src_prepare() { default