sci-libs/fflas-ffpack: patch to avoid -fabi-version=6.

This is part two of a quick fix to prevent -fabi-version=6 from
finding its way into CXXFLAGS with givaro and fflas-ffpack. A better
fix is upstream, but difficult to backport. Since in Gentoo we don't
support gcc-4.x, I've just deleted the stuff.

I've made a new revision because the -fabi-version flags wind up
in "fflas-ffpack-config --cflags".

Closes: https://bugs.gentoo.org/741434
Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Michael Orlitzky <mjo@gentoo.org>

2 files changed, 32 insertions, 0 deletions

diff --git a/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r1.ebuild b/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r2.ebuild
index a4de61200a13..b97b581707a8 100644
--- a/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r1.ebuild
+++ b/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r2.ebuild
@@ -30,6 +30,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-2.3.2-blaslapack.patch"
 	"${FILESDIR}/${P}-no-test-echelon.patch"
 	"${FILESDIR}/${P}-fix-internal-linking.patch"
+	"${FILESDIR}/${P}-no-fabi-version.patch"
 )
 
 pkg_pretend() {
diff --git a/sci-libs/fflas-ffpack/files/fflas-ffpack-2.4.3-no-fabi-version.patch b/sci-libs/fflas-ffpack/files/fflas-ffpack-2.4.3-no-fabi-version.patch
new file mode 100644
index 000000000000..48ae6c37166a
--- /dev/null
+++ b/sci-libs/fflas-ffpack/files/fflas-ffpack-2.4.3-no-fabi-version.patch
@@ -0,0 +1,31 @@
+From 11364be98b200405630117d5eebb33bfdbc8c19e Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Sat, 7 Aug 2021 12:09:39 -0400
+Subject: [PATCH 1/1] configure.ac: don't append -fabi-version=6 to CXXFLAGS.
+
+This is a quick hack to avoid appending -fabi-version=6 to CXXFLAGS.
+Both givaro and fflas-ffpack have problems with this legacy cruft
+that are fixed upstream but tough to backport. We don't support
+compilers that old, so we can just delete it.
+---
+ configure.ac | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 571d923..616b2f5 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -179,10 +179,6 @@ AC_SUBST(SIMD_FLAGS)
+ dnl gcc-4.9.2 bug See https://trac.sagemath.org/ticket/17635#comment:178
+ AS_IF([ test  "x$CCNAM" = "xgcc492" ],[REQUIRED_FLAGS="${REQUIRED_FLAGS} -fpermissive"],[])
+ 
+-dnl With GCC's default ABI version, a __m128 or __m256 are the same types and therefore we cannot
+-dnl have overloads for both types without linking error.
+-AS_IF([test "x$CCNAM" = "xgcc"],[REQUIRED_FLAGS="${REQUIRED_FLAGS} -fabi-version=6"],[])
+-
+ AC_SUBST(REQUIRED_FLAGS)
+ 
+ PARFLAGS="${OMPFLAGS}"
+-- 
+2.31.1
+