gentoo auto-resync : 25:03:2023 - 06:49:35

3 files changed, 56 insertions, 2 deletions

diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest
index 23284499389c..d0bad57d573f 100644
--- a/dev-libs/elfutils/Manifest
+++ b/dev-libs/elfutils/Manifest
@@ -1,8 +1,9 @@
+AUX elfutils-0.189-configure-bashisms.patch 2086 BLAKE2B 4ecebe40ee2c628bdbd26fce6bfd487517ee8f9590cd2d565f4be34cf9afe67b59fd9cb225039ae911f9cf939783cef0cb623d7264fff07255abe89aed9c509f SHA512 0db8aaafd625cb57b9a7a16c841685b44beaff4b18d9ea15e5adf2e0a7bf14340be7c17ebda9278f1f88ec14e5457b720c4fc4e7e7b81e861fc83059b93b8e3f
 DIST elfutils-0.187-patches.tar.xz 2804 BLAKE2B 77cbd0666d8da3d5229baaba6605c84e7990200f39bfb72b2008eb2527e4567abd90c93c291cc0c8f3c10bbf97758ccf5877cbdae823780cf8dc97ff4ff2f932 SHA512 d056fdd6ae0e71471087af472a72384d6e73ff2d7fe1b708b5ec9f091a913c8327197660132b7a6619a0db86534715507ef67ee91691a00a591c1d24c55a99f4
 DIST elfutils-0.188.tar.bz2 9112977 BLAKE2B 6b0474f1436eaf6af73b735b9b2ddd5448ab9c03fbaa0be745a31c89ae8f15b0e21a651409c38643ca125794ce82c19d7b46db4a079f3e72cb919d643560e7a4 SHA512 585551b2d937d19d1becfc2f28935db1dd1a3d25571a62f322b70ac8da98c1a741a55d070327705df6c3e2ee026652e0b9a3c733b050a0b0ec5f2fc75d5b74b5
 DIST elfutils-0.188.tar.bz2.sig 310 BLAKE2B c8d9135cffde3b1dd337b692d5351855cf799915d3ebd553327febaac192bd2f108b3f45a6376d458e179390a1ceaf4809762cdc40ea1e05fed0214ac33ed56e SHA512 4cc8a7417d244e319a1650d71b1831660cfe41afc7c73e9c83d1f076f4013fe15247e8b4f5e12a5396d83c4f1c7663ca4be5ea42bff3dc23263f85331fd9d566
 DIST elfutils-0.189.tar.bz2 9143169 BLAKE2B 30596271e14cf3408326abc38a9775b849b8cb0ee119a5455df9434a7d3b9a57afb15e0236a179a26c7bd400d303749964c9d6350c419f747784fd99d12517e0 SHA512 93a877e34db93e5498581d0ab2d702b08c0d87e4cafd9cec9d6636dfa85a168095c305c11583a5b0fb79374dd93bc8d0e9ce6016e6c172764bcea12861605b71
 DIST elfutils-0.189.tar.bz2.sig 310 BLAKE2B d4155de64b15a9ab5c497cd603e73bf918eb1117de36cf28f8ddb50ccb4874fb24cffdf44bcbbc028b2ef3f64562960bf11a431274d861f9db96e3d865b37ec2 SHA512 2016c5f0ccd16f7feb0c825164bb18b2f1afad17dcd39d9f159429360fe4afd645665f612397d48bde191a1e59bb8352e2d065d61d7f649b929c3a7e7bfe8dd0
 EBUILD elfutils-0.188.ebuild 3415 BLAKE2B 2415e7ed6cc16e3cbf43d96ef928f10af8fba89ab1e0e3afd6eba16aaf5b8bf10c14731c51f3e47ad8b10ac2f3a00508fe6d27eb5160d222fad0cd571ba07407 SHA512 766e831f104aa12ca6efd328998369f61979f3bfc0b35f0b65c1e155c58fa4b13f3ae32c668dd046a0ba231f80958d82e63d245db375bc6025f46d72c0181ce8
-EBUILD elfutils-0.189.ebuild 3423 BLAKE2B 5e0891911025fdec075eaae9a05faf0aa016e02f8673fcac678bdbc53fff91f89a36cc7538abd31e27f305a3c13eca658e2ebd7bcf37fa21991e5bf6a77238ed SHA512 f8ccd6e67141fc9afff25e9af36b36ec6949937e42e9fde0c86e5c3382c9c62763ab6a9e642a469cc74b6a47946bcb37115b5fbce34638ba3b5c5c8cc7c3b1ab
+EBUILD elfutils-0.189-r1.ebuild 3561 BLAKE2B 8421da2f274300e600381696775718f8d44eff2235e3f1b2431993fd3a7e1766e286ad4a6b5b09a79baf981191a6a870e633a9ded973c0ef60611380509ed734 SHA512 0bd54a638171ef6528f8ef03bd2d300d7ce9f6eea850ec0d42fa8b478c7db35a65503005d2c3b91e005a88411d88cccd400fac1b4e8dcf65407234ca6e2ac841
 MISC metadata.xml 655 BLAKE2B 246409a9ea3b4ada7ab225dc524b7fe7241a5a65e29b7ccacfb59b6810d19ab7b06aff7bc5024946745da063ea9df4dc7646ee146526a3104504e16ee515b118 SHA512 7a7b42842d8ebb53d45ca3d4feb588f22b106e1023254fb96b39f39b3d8dcd6c5f2b7263e1e696f760daa3472deef43f44578a650b8417facfa17e246782247b
diff --git a/dev-libs/elfutils/elfutils-0.189.ebuild b/dev-libs/elfutils/elfutils-0.189-r1.ebuild
index 0df16d8efdf8..285cb3c8c192 100644
--- a/dev-libs/elfutils/elfutils-0.189.ebuild
+++ b/dev-libs/elfutils/elfutils-0.189-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/elfutils.gpg
-inherit flag-o-matic multilib-minimal verify-sig
+inherit autotools flag-o-matic multilib-minimal verify-sig
 
 DESCRIPTION="Libraries/utilities to handle ELF objects (drop in replacement for libelf)"
 HOMEPAGE="https://sourceware.org/elfutils/"
@@ -44,6 +44,7 @@ BDEPEND="
 
 PATCHES=(
 	"${WORKDIR}"/${PN}-0.187-patches/
+	"${FILESDIR}"/${P}-configure-bashisms.patch
 )
 
 src_unpack() {
@@ -62,6 +63,9 @@ src_prepare() {
 		eapply "${WORKDIR}"/${PN}-0.187-patches/musl/
 	fi
 
+	# Only here for ${P}-configure-bashisms.patch, delete on next bump!
+	eautoreconf
+
 	if ! use static-libs; then
 		sed -i -e '/^lib_LIBRARIES/s:=.*:=:' -e '/^%.os/s:%.o$::' lib{asm,dw,elf}/Makefile.in || die
 	fi
diff --git a/dev-libs/elfutils/files/elfutils-0.189-configure-bashisms.patch b/dev-libs/elfutils/files/elfutils-0.189-configure-bashisms.patch
new file mode 100644
index 000000000000..04c01b0ecf88
--- /dev/null
+++ b/dev-libs/elfutils/files/elfutils-0.189-configure-bashisms.patch
@@ -0,0 +1,49 @@
+https://sourceware.org/git/?p=elfutils.git;a=commit;h=a9834d7df68afde4ee44ee8fef888cf7e799171a
+
+From a9834d7df68afde4ee44ee8fef888cf7e799171a Mon Sep 17 00:00:00 2001
+From: Mark Wielaard <mark@klomp.org>
+Date: Sun, 5 Mar 2023 13:09:34 +0100
+Subject: [PATCH] configure.ac contains Bashisms
+
+Autoconf scripts are supposed to be written in POSIX-compatible shell
+language. elfutils commits 0ffe2874e75d48cb88936e119e5284ff2bf664d9
+and 3fa98a6f29b0f370e32549ead7eb897c839af980 introduced Bashisms to
+configure.ac that cause errors when /bin/sh is not Bash.
+
+Example error when /bin/sh is Dash:
+
+./configure: 8748: test: xyes: unexpected operator
+
+The cause of the error is the use of a non-existent == operator in
+expressions passed to the 'test' built-in command. POSIX shell
+specifies only an = operator for testing string equality.
+
+  * configure.ac: Replace == by = in use_msan and enable_demangler
+  comparisons.
+
+https://sourceware.org/bugzilla/show_bug.cgi?id=30196
+
+Reported-by: Matt Whitlock <sourceware@mattwhitlock.name>
+Signed-off-by: Mark Wielaard <mark@klomp.org>
+--- a/configure.ac
++++ b/configure.ac
+@@ -169,7 +169,7 @@ if test "$use_msan" = yes; then
+   CXXFLAGS="$CXXFLAGS -fsanitize=memory -fsanitize-memory-track-origins -D_FORTIFY_SOURCE=0"
+   LDFLAGS="-shared"
+   AC_LINK_IFELSE([AC_LANG_SOURCE([int main (int argc, char **argv) { return 0; }])], use_msan=yes, use_msan=no)
+-  AS_IF([test "x$use_msan" == xyes],
++  AS_IF([test "x$use_msan" = xyes],
+         ac_cv_zdefs=no NO_UNDEFINED=,
+         AC_MSG_WARN([clang memory sanitizer not available])
+         CFLAGS="$old_CFLAGS" CXXFLAGS="$old_CXXFLAGS")
+@@ -493,7 +493,7 @@ AC_ARG_ENABLE([demangler],
+ AS_HELP_STRING([--disable-demangler],
+ 	       [Disable libstdc++ demangle support]),
+ 	       [], [enable_demangler=yes])
+-AS_IF([test "x$enable_demangler" == xyes],
++AS_IF([test "x$enable_demangler" = xyes],
+ AC_CHECK_LIB([stdc++], [__cxa_demangle], [dnl
+ AC_DEFINE([USE_DEMANGLE], [1], [Defined if demangling is enabled])])
+ AM_CONDITIONAL(DEMANGLE, test "x$ac_cv_lib_stdcpp___cxa_demangle" = "xyes")
+-- 
+2.31.1