From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3F83C15864F for ; Sat, 25 Mar 2023 01:41:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6DD15E08CE; Sat, 25 Mar 2023 01:41:30 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 45E0EE08CE for ; Sat, 25 Mar 2023 01:41:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 42559340FC4 for ; Sat, 25 Mar 2023 01:41:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 76C8F17 for ; Sat, 25 Mar 2023 01:41:27 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1679708476.841c181bcfa1725454bd1cbfefe1064608dbc726.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/elfutils/files/, dev-libs/elfutils/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/elfutils/elfutils-0.189-r1.ebuild dev-libs/elfutils/elfutils-0.189.ebuild dev-libs/elfutils/files/elfutils-0.189-configure-bashisms.patch X-VCS-Directories: dev-libs/elfutils/files/ dev-libs/elfutils/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 841c181bcfa1725454bd1cbfefe1064608dbc726 X-VCS-Branch: master Date: Sat, 25 Mar 2023 01:41:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3b715542-b037-4f43-a85e-d970795e432f X-Archives-Hash: b274ec656508843b0079d77279dc6e6f commit: 841c181bcfa1725454bd1cbfefe1064608dbc726 Author: Sam James gentoo org> AuthorDate: Fri Mar 24 08:03:08 2023 +0000 Commit: Sam James gentoo org> CommitDate: Sat Mar 25 01:41:16 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=841c181b dev-libs/elfutils: fix bashisms in configure Signed-off-by: Sam James gentoo.org> ...utils-0.189.ebuild => elfutils-0.189-r1.ebuild} | 6 ++- .../files/elfutils-0.189-configure-bashisms.patch | 49 ++++++++++++++++++++++ 2 files changed, 54 insertions(+), 1 deletion(-) diff --git a/dev-libs/elfutils/elfutils-0.189.ebuild b/dev-libs/elfutils/elfutils-0.189-r1.ebuild similarity index 94% rename from dev-libs/elfutils/elfutils-0.189.ebuild rename to 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 +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 +Signed-off-by: Mark Wielaard +--- 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