commit: b64f44870960b1d321a911135687e332ab5d8ac5 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> AuthorDate: Wed Nov 11 19:36:51 2020 +0000 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> CommitDate: Wed Nov 11 19:37:12 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b64f4487
dev-libs/libffi: fix vendor detection on 'dash' shell Reported-by: Paolo Pedroni Closes: https://bugs.gentoo.org/753299 Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> .../files/libffi-3.3-compiler-vendor-quote.patch | 33 ++++++++++++++++++++++ dev-libs/libffi/libffi-3.3-r2.ebuild | 1 + 2 files changed, 34 insertions(+) diff --git a/dev-libs/libffi/files/libffi-3.3-compiler-vendor-quote.patch b/dev-libs/libffi/files/libffi-3.3-compiler-vendor-quote.patch new file mode 100644 index 00000000000..db5b69ce2db --- /dev/null +++ b/dev-libs/libffi/files/libffi-3.3-compiler-vendor-quote.patch @@ -0,0 +1,33 @@ +https://bugs.gentoo.org/753299 +--- a/testsuite/lib/libffi.exp ++++ b/testsuite/lib/libffi.exp +@@ -287,9 +287,6 @@ proc libffi-init { args } { + verbose "libffi $blddirffi" + + # Which compiler are we building with? +- set tmp [grep "$blddirffi/config.log" "^ax_cv_c_compiler_vendor.*$"] +- regexp -- {^[^=]*=(.*)$} $tmp nil compiler_vendor +- + if { [string match $compiler_vendor "gnu"] } { + set gccdir [lookfor_file $tool_root_dir gcc/libgcc.a] + if {$gccdir != ""} { +--- a/configure.ac ++++ b/configure.ac +@@ -59,6 +59,7 @@ fi + cat > local.exp <<EOF + set CC_FOR_TARGET "$CC" + set CXX_FOR_TARGET "$CXX" ++set compiler_vendor "$ax_cv_c_compiler_vendor" + EOF + + AM_MAINTAINER_MODE +--- a/configure ++++ b/configure +@@ -17402,6 +17402,7 @@ fi + cat > local.exp <<EOF + set CC_FOR_TARGET "$CC" + set CXX_FOR_TARGET "$CXX" ++set compiler_vendor "$ax_cv_c_compiler_vendor" + EOF + + diff --git a/dev-libs/libffi/libffi-3.3-r2.ebuild b/dev-libs/libffi/libffi-3.3-r2.ebuild index 0b379dac2a4..55138eb082d 100644 --- a/dev-libs/libffi/libffi-3.3-r2.ebuild +++ b/dev-libs/libffi/libffi-3.3-r2.ebuild @@ -32,6 +32,7 @@ PATCHES=( "${FILESDIR}"/${PN}-3.3-power7-memcpy-2.patch "${FILESDIR}"/${PN}-3.3-ppc-int128.patch "${FILESDIR}"/${PN}-3.3-ppc-vector-offset.patch + "${FILESDIR}"/${PN}-3.3-compiler-vendor-quote.patch ) S=${WORKDIR}/${MY_P}
