* [gentoo-commits] repo/gentoo:master commit in: sci-libs/fflas-ffpack/, sci-libs/fflas-ffpack/files/
@ 2021-08-07 11:52 Michael Orlitzky
0 siblings, 0 replies; 6+ messages in thread
From: Michael Orlitzky @ 2021-08-07 11:52 UTC (permalink / raw
To: gentoo-commits
commit: a5a8d55506726bc2b58ae3644c157682a77a9503
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 7 03:44:21 2021 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sat Aug 7 11:47:16 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5a8d555
sci-libs/fflas-ffpack: disable a (sometimes) failing test case.
One of the test programs for fflas-ffpack is failing on both Gentoo
and Conda, and may indicate an upstream problem. In the meantime,
having the test suite fail is of no use to Gentoo users. This commit
disables the test until we can figure out the right way to fix it.
Closes: https://bugs.gentoo.org/725446
Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r1.ebuild | 8 ++++-
.../files/fflas-ffpack-2.4.3-no-test-echelon.patch | 39 ++++++++++++++++++++++
2 files changed, 46 insertions(+), 1 deletion(-)
diff --git a/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r1.ebuild b/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r1.ebuild
index 574fe036ecf..de1d816c146 100644
--- a/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r1.ebuild
+++ b/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r1.ebuild
@@ -23,7 +23,13 @@ DEPEND="virtual/cblas
=sci-libs/givaro-4.1*"
RDEPEND="${DEPEND}"
-PATCHES=( "${FILESDIR}/${PN}-2.3.2-blaslapack.patch" )
+# The no-test-echelon patch works around a test failure that may
+# eventually be fixed upstream. Gentoo bug 725446 and upstream
+# Github issue 282.
+PATCHES=(
+ "${FILESDIR}/${PN}-2.3.2-blaslapack.patch"
+ "${FILESDIR}/${P}-no-test-echelon.patch"
+)
pkg_pretend() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
diff --git a/sci-libs/fflas-ffpack/files/fflas-ffpack-2.4.3-no-test-echelon.patch b/sci-libs/fflas-ffpack/files/fflas-ffpack-2.4.3-no-test-echelon.patch
new file mode 100644
index 00000000000..0b8b68fa609
--- /dev/null
+++ b/sci-libs/fflas-ffpack/files/fflas-ffpack-2.4.3-no-test-echelon.patch
@@ -0,0 +1,39 @@
+From 5be5c93ed41d0136730477beccad7b9f21d47e86 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Tue, 26 May 2020 09:45:50 -0400
+Subject: [PATCH 1/1] tests: disable test_echelon.
+
+There are two reported failures of test_echelon on Gentoo and Conda
+that the Gentoo maintainers haven't been able to reproduce yet. Until
+upstream has a chance to look at the failures, this commit disables
+that particular test.
+
+Gentoo-bug: https://bugs.gentoo.org/724526
+Upstream-bug: https://github.com/linbox-team/fflas-ffpack/issues/282
+---
+ tests/Makefile.am | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index 4326820..62e92bc 100755
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -56,7 +56,6 @@ BASIC_TESTS = \
+ test-rankprofiles \
+ test-det \
+ test-det-check \
+- test-echelon \
+ test-charpoly \
+ test-charpoly-check \
+ test-minpoly \
+@@ -119,7 +118,6 @@ test_ftrsm_check_SOURCES = test-ftrsm-check.C
+ test_invert_check_SOURCES = test-invert-check.C
+ test_charpoly_check_SOURCES = test-charpoly-check.C
+ test_minpoly_SOURCES = test-minpoly.C
+-test_echelon_SOURCES = test-echelon.C
+ test_rankprofiles_SOURCES = test-rankprofiles.C
+ test_fgemm_SOURCES = test-fgemm.C
+ test_fger_SOURCES = test-fger.C
+--
+2.26.2
+
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/fflas-ffpack/, sci-libs/fflas-ffpack/files/
@ 2021-08-07 12:57 Michael Orlitzky
0 siblings, 0 replies; 6+ messages in thread
From: Michael Orlitzky @ 2021-08-07 12:57 UTC (permalink / raw
To: gentoo-commits
commit: f6f7751c4da8814e15108b87c079e0312c2e6cfd
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 7 12:20:21 2021 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sat Aug 7 12:55:07 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6f7751c
sci-libs/fflas-ffpack: fix linking with slibtool.
I've backported the patch from upstream PR 339 to fix this issue in
the release tarball. I had intended to wait for an upstream
comment... but we might be waiting a while. Thanks to orbea for
debugging and fixing the problem!
Closes: https://bugs.gentoo.org/787746
Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r1.ebuild | 1 +
.../fflas-ffpack-2.4.3-fix-internal-linking.patch | 70 ++++++++++++++++++++++
2 files changed, 71 insertions(+)
diff --git a/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r1.ebuild b/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r1.ebuild
index de1d816c146..a4de61200a1 100644
--- a/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r1.ebuild
+++ b/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r1.ebuild
@@ -29,6 +29,7 @@ RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}/${PN}-2.3.2-blaslapack.patch"
"${FILESDIR}/${P}-no-test-echelon.patch"
+ "${FILESDIR}/${P}-fix-internal-linking.patch"
)
pkg_pretend() {
diff --git a/sci-libs/fflas-ffpack/files/fflas-ffpack-2.4.3-fix-internal-linking.patch b/sci-libs/fflas-ffpack/files/fflas-ffpack-2.4.3-fix-internal-linking.patch
new file mode 100644
index 00000000000..5f085554c33
--- /dev/null
+++ b/sci-libs/fflas-ffpack/files/fflas-ffpack-2.4.3-fix-internal-linking.patch
@@ -0,0 +1,70 @@
+From 7c959a3e938a32b386418ddfdfbb884a96762d90 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Sat, 7 Aug 2021 08:14:44 -0400
+Subject: [PATCH 1/1] fflas-ffpack/interfaces/libs/Makefile.am: fix internal
+ linking.
+
+This is just,
+
+ https://github.com/linbox-team/fflas-ffpack/pull/339
+
+but rebased onto the old release tarball.
+---
+ fflas-ffpack/interfaces/libs/Makefile.am | 22 ++++++++--------------
+ 1 file changed, 8 insertions(+), 14 deletions(-)
+
+diff --git a/fflas-ffpack/interfaces/libs/Makefile.am b/fflas-ffpack/interfaces/libs/Makefile.am
+index 8c56746..449f6e4 100644
+--- a/fflas-ffpack/interfaces/libs/Makefile.am
++++ b/fflas-ffpack/interfaces/libs/Makefile.am
+@@ -24,7 +24,6 @@ pkgincludesubdir=$(pkgincludedir)/interfaces/libs
+
+ AM_CXXFLAGS = @DEFAULT_CFLAGS@
+ AM_CPPFLAGS = -I$(top_srcdir) #/fflas-ffpack/utils/ -I$(top_srcdir)/fflas-ffpack/fflas/ -I$(top_srcdir)/fflas-ffpack/ffpack -I$(top_srcdir)/fflas-ffpack/field
+-LDADD = $(CBLAS_LIBS) $(GIVARO_LIBS) $(CUDA_LIBS) $(PARFLAGS)
+ #AM_LDFLAGS=-static
+
+
+@@ -55,31 +54,26 @@ libfflas_la_SOURCES= fflas_L1_inst.C \
+ fflas_L3_inst.C \
+ fflas_L3_inst_implem.inl
+
+-libfflas_la_LDFLAGS= $(LDADD) -version-info 1:0:0 \
+- -no-undefined
++libfflas_la_LIBADD= $(CBLAS_LIBS) $(GIVARO_LIBS) $(CUDA_LIBS) $(PARLIBS)
++libfflas_la_LDFLAGS= -version-info 1:0:0 -no-undefined
+
+ libffpack_la_SOURCES= ffpack_inst.C \
+ ffpack_inst_implem.inl
+-libffpack_la_LDFLAGS= $(LDADD) -version-info 1:0:0 \
+- -no-undefined $(top_builddir)/fflas-ffpack/interfaces/libs/libfflas.la
+-
+-EXTRA_libffpack_la_DEPENDENCIES= libfflas.la
++libffpack_la_LIBADD= libfflas.la
++libffpack_la_LDFLAGS= -version-info 1:0:0 -no-undefined
+
+ libfflas_c_la_SOURCES=fflas_lvl1.C \
+ fflas_lvl2.C \
+ fflas_lvl3.C \
+ fflas_sparse.C
+ #libfflas_c_la_CPPFLAGS=$(AM_CPPFLAGS) -DFFLAS_COMPILED -DFFPACK_COMPILED
+-libfflas_c_la_LDFLAGS= $(LDADD) -version-info 1:0:0 \
+- -no-undefined $(top_builddir)/fflas-ffpack/interfaces/libs/libfflas.la
+-
+-EXTRA_libfflas_c_la_DEPENDENCIES=libfflas.la
++libfflas_c_la_LIBADD= libfflas.la
++libfflas_c_la_LDFLAGS= -version-info 1:0:0 -no-undefined
+
+ libffpack_c_la_SOURCES=ffpack.C
+ #libffpack_c_la_CPPFLAGS=$(AM_CPPFLAGS) -DFFLAS_COMPILED -DFFPACK_COMPILED
+-libffpack_c_la_LDFLAGS= $(LDADD) -version-info 1:0:0 \
+- -no-undefined -lfflas -lffpack
+-EXTRA_libffpack_c_la_DEPENDENCIES=libffpack.la
++libffpack_c_la_LIBADD= libffpack.la
++libffpack_c_la_LDFLAGS= -version-info 1:0:0 -no-undefined
+
+
+ EXTRA_DIST=c_libs.doxy
+--
+2.31.1
+
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/fflas-ffpack/, sci-libs/fflas-ffpack/files/
@ 2021-08-07 16:37 Michael Orlitzky
0 siblings, 0 replies; 6+ messages in thread
From: Michael Orlitzky @ 2021-08-07 16:37 UTC (permalink / raw
To: gentoo-commits
commit: 0986d11b9e8cc6aeee297afc358cf76e53283665
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 7 16:32:54 2021 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sat Aug 7 16:35:54 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0986d11b
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 <AT> gentoo.org>
....4.3-r1.ebuild => fflas-ffpack-2.4.3-r2.ebuild} | 1 +
.../files/fflas-ffpack-2.4.3-no-fabi-version.patch | 31 ++++++++++++++++++++++
2 files changed, 32 insertions(+)
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
similarity index 98%
rename from sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r1.ebuild
rename to sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r2.ebuild
index a4de61200a1..b97b581707a 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 00000000000..48ae6c37166
--- /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
+
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/fflas-ffpack/, sci-libs/fflas-ffpack/files/
@ 2022-09-02 11:28 Michael Orlitzky
0 siblings, 0 replies; 6+ messages in thread
From: Michael Orlitzky @ 2022-09-02 11:28 UTC (permalink / raw
To: gentoo-commits
commit: d6e742b3835750d6992128d07b34165f65a57818
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 2 11:17:53 2022 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Fri Sep 2 11:28:07 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6e742b3
sci-libs/fflas-ffpack: fix pkg-config libdir, update EAPI 7 -> 8
Apply François Bissey's upstream patch in a new revision.
Closes: https://bugs.gentoo.org/862747
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r3.ebuild | 75 ++++++++++++++++++++++
.../files/fflas-ffpack-2.4.3-fix-pc-libdir.patch | 21 ++++++
2 files changed, 96 insertions(+)
diff --git a/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r3.ebuild b/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r3.ebuild
new file mode 100644
index 000000000000..87c452d6e355
--- /dev/null
+++ b/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r3.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Library for dense linear algebra over word-size finite fields"
+HOMEPAGE="https://linbox-team.github.io/fflas-ffpack/"
+SRC_URI="https://github.com/linbox-team/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="openmp cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_avx512dq cpu_flags_x86_avx512vl"
+
+# Our autotools patch hacks in PKG_CHECK_MODULES calls.
+BDEPEND="virtual/pkgconfig"
+DEPEND="virtual/cblas
+ virtual/blas
+ virtual/lapack
+ dev-libs/gmp[cxx(+)]
+ =sci-libs/givaro-4.1*"
+RDEPEND="${DEPEND}"
+
+# The no-test-echelon patch works around a test failure that may
+# eventually be fixed upstream. Gentoo bug 725446 and upstream
+# Github issue 282. Same for test-fgesv (bug 807100).
+PATCHES=(
+ "${FILESDIR}/${PN}-2.3.2-blaslapack.patch"
+ "${FILESDIR}/${P}-no-test-echelon.patch"
+ "${FILESDIR}/${P}-no-test-fgesv.patch"
+ "${FILESDIR}/${P}-fix-internal-linking.patch"
+ "${FILESDIR}/${P}-no-fabi-version.patch"
+ "${FILESDIR}/${P}-fix-pc-libdir.patch"
+)
+
+pkg_pretend() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+ tc-export PKG_CONFIG
+}
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --enable-precompilation \
+ $(use_enable openmp) \
+ $(use_enable cpu_flags_x86_fma3 fma) \
+ $(use_enable cpu_flags_x86_fma4 fma4) \
+ $(use_enable cpu_flags_x86_sse3 sse3) \
+ $(use_enable cpu_flags_x86_ssse3 ssse3) \
+ $(use_enable cpu_flags_x86_sse4_1 sse41) \
+ $(use_enable cpu_flags_x86_sse4_2 sse42) \
+ $(use_enable cpu_flags_x86_avx avx) \
+ $(use_enable cpu_flags_x86_avx2 avx2) \
+ $(use_enable cpu_flags_x86_avx512f avx512f) \
+ $(use_enable cpu_flags_x86_avx512dq avx512dq) \
+ $(use_enable cpu_flags_x86_avx512vl avx512vl)
+}
+
+src_install() {
+ default
+ find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/sci-libs/fflas-ffpack/files/fflas-ffpack-2.4.3-fix-pc-libdir.patch b/sci-libs/fflas-ffpack/files/fflas-ffpack-2.4.3-fix-pc-libdir.patch
new file mode 100644
index 000000000000..e397758b5fc5
--- /dev/null
+++ b/sci-libs/fflas-ffpack/files/fflas-ffpack-2.4.3-fix-pc-libdir.patch
@@ -0,0 +1,21 @@
+From b1f7cadc105bcf1264da68ab69e0cdc6f8a5aa63 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fran=C3=A7ois=20Bissey?= <frp.bissey@gmail.com>
+Date: Sun, 7 Aug 2022 14:15:49 +1200
+Subject: [PATCH] Fix fflas-ffpack.pc.in for issue #364
+
+---
+ fflas-ffpack.pc.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/fflas-ffpack.pc.in b/fflas-ffpack.pc.in
+index b869dd8f..8d6c823a 100644
+--- a/fflas-ffpack.pc.in
++++ b/fflas-ffpack.pc.in
+@@ -1,6 +1,6 @@
+ prefix=@prefix@
+ exec_prefix=@prefix@
+-libdir=@prefix@/lib
++libdir=@libdir@
+ includedir=@prefix@/include
+
+ Name: fflas-ffpack
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/fflas-ffpack/, sci-libs/fflas-ffpack/files/
@ 2024-02-18 14:41 Michael Orlitzky
0 siblings, 0 replies; 6+ messages in thread
From: Michael Orlitzky @ 2024-02-18 14:41 UTC (permalink / raw
To: gentoo-commits
commit: 4a9befd789f03603d4e5d5d4a7a095862a8a5cf4
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 18 14:39:03 2024 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sun Feb 18 14:39:42 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a9befd7
sci-libs/fflas-ffpack: disable another flaky test
Closes: https://bugs.gentoo.org/924880
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
sci-libs/fflas-ffpack/fflas-ffpack-2.5.0-r1.ebuild | 1 +
.../files/fflas-ffpack-2.5.0-no-test-fsyr2k.patch | 30 ++++++++++++++++++++++
2 files changed, 31 insertions(+)
diff --git a/sci-libs/fflas-ffpack/fflas-ffpack-2.5.0-r1.ebuild b/sci-libs/fflas-ffpack/fflas-ffpack-2.5.0-r1.ebuild
index 90005f9a7fc4..46851e065012 100644
--- a/sci-libs/fflas-ffpack/fflas-ffpack-2.5.0-r1.ebuild
+++ b/sci-libs/fflas-ffpack/fflas-ffpack-2.5.0-r1.ebuild
@@ -27,6 +27,7 @@ PATCHES=(
"${FILESDIR}/${PN}-2.5.0-blaslapack.patch"
"${FILESDIR}/${PN}-2.4.3-no-test-echelon.patch"
"${FILESDIR}/${PN}-2.4.3-fix-pc-libdir.patch"
+ "${FILESDIR}/${PN}-2.5.0-no-test-fsyr2k.patch"
)
pkg_pretend() {
diff --git a/sci-libs/fflas-ffpack/files/fflas-ffpack-2.5.0-no-test-fsyr2k.patch b/sci-libs/fflas-ffpack/files/fflas-ffpack-2.5.0-no-test-fsyr2k.patch
new file mode 100644
index 000000000000..102f5f7dd90b
--- /dev/null
+++ b/sci-libs/fflas-ffpack/files/fflas-ffpack-2.5.0-no-test-fsyr2k.patch
@@ -0,0 +1,30 @@
+From 59ba369aee228b0d166cd7f86d365b17a0104777 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Sun, 18 Feb 2024 07:39:09 -0500
+Subject: [PATCH 1/1] tests/Makefile.am: disable test-fsyr2k
+
+We have a report of this failing on Gentoo, and it's unlikely to get
+fixed any time soon. In any case it's reported upstream at,
+
+ https://github.com/linbox-team/fflas-ffpack/issues/393
+
+Bug: https://bugs.gentoo.org/924880
+---
+ tests/Makefile.am | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index cd73818..2941182 100755
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -57,7 +57,6 @@ BASIC_TESTS = \
+ test-quasisep \
+ test-pluq-check \
+ test-fsyrk \
+- test-fsyr2k \
+ test-fsytrf \
+ test-invert-check \
+ test-rankprofiles \
+--
+2.43.0
+
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/fflas-ffpack/, sci-libs/fflas-ffpack/files/
@ 2024-07-14 23:22 Michael Orlitzky
0 siblings, 0 replies; 6+ messages in thread
From: Michael Orlitzky @ 2024-07-14 23:22 UTC (permalink / raw
To: gentoo-commits
commit: c1d22f0434a0c8c4afac29987671b82248f1f9a4
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 14 23:06:59 2024 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sun Jul 14 23:21:29 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1d22f04
sci-libs/fflas-ffpack: drop 2.4.3-r3
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
sci-libs/fflas-ffpack/Manifest | 1 -
sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r3.ebuild | 73 ------------------
.../files/fflas-ffpack-2.3.2-blaslapack.patch | 90 ----------------------
.../fflas-ffpack-2.4.3-fix-internal-linking.patch | 70 -----------------
.../files/fflas-ffpack-2.4.3-no-fabi-version.patch | 31 --------
.../files/fflas-ffpack-2.4.3-no-test-fgesv.patch | 37 ---------
6 files changed, 302 deletions(-)
diff --git a/sci-libs/fflas-ffpack/Manifest b/sci-libs/fflas-ffpack/Manifest
index da511b79674d..cbc8cdfe88a2 100644
--- a/sci-libs/fflas-ffpack/Manifest
+++ b/sci-libs/fflas-ffpack/Manifest
@@ -1,2 +1 @@
-DIST fflas-ffpack-2.4.3.tar.gz 1059033 BLAKE2B e416429bb426a81cf9c25d54c83380ff9a9d658c711da06e6359d968843d4d9d26cf8389379f9ad4a5cbcee93e0afc9fe0497bb7a8f190e0c72c0b1f7b67de18 SHA512 c7620ba5a92e4114a581a6bea32267f9d5a9f0eb7e23fc0a7a97ce4b8124bb7b29f89ff2ad6ad270d97c76489625b57a354e581905b74ee57b35f4ca3e196a44
DIST fflas-ffpack-2.5.0.tar.gz 1098354 BLAKE2B 34b0cd218e83a71c6540b1768c8231246a0dc360eb7e2353a923b5870d228e702291de14b0dc3e7c5055727fbd62e2bc1bd1d2ac432dd99df978a1edb513bfc0 SHA512 6753022f27d354160f5eb436c713002f61d24e9a942f2463e36bf324b19ec096f34dd9cacb8529ba566f245f88fa303dcfb448a40d0c39d340f7c337cd1788a4
diff --git a/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r3.ebuild b/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r3.ebuild
deleted file mode 100644
index f5b94166a028..000000000000
--- a/sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r3.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools toolchain-funcs
-
-DESCRIPTION="Library for dense linear algebra over word-size finite fields"
-HOMEPAGE="https://linbox-team.github.io/fflas-ffpack/"
-SRC_URI="https://github.com/linbox-team/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="openmp cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_avx512dq cpu_flags_x86_avx512vl"
-
-# Our autotools patch hacks in PKG_CHECK_MODULES calls.
-BDEPEND="virtual/pkgconfig"
-DEPEND="virtual/cblas
- virtual/blas
- virtual/lapack
- dev-libs/gmp[cxx(+)]
- =sci-libs/givaro-4.1*"
-RDEPEND="${DEPEND}"
-
-# The no-test-echelon patch works around a test failure that may
-# eventually be fixed upstream. Gentoo bug 725446 and upstream
-# Github issue 282. Same for test-fgesv (bug 807100).
-PATCHES=(
- "${FILESDIR}/${PN}-2.3.2-blaslapack.patch"
- "${FILESDIR}/${P}-no-test-echelon.patch"
- "${FILESDIR}/${P}-no-test-fgesv.patch"
- "${FILESDIR}/${P}-fix-internal-linking.patch"
- "${FILESDIR}/${P}-no-fabi-version.patch"
- "${FILESDIR}/${P}-fix-pc-libdir.patch"
-)
-
-pkg_pretend() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- tc-export PKG_CONFIG
-
- econf \
- --enable-precompilation \
- $(use_enable openmp) \
- $(use_enable cpu_flags_x86_fma3 fma) \
- $(use_enable cpu_flags_x86_fma4 fma4) \
- $(use_enable cpu_flags_x86_sse3 sse3) \
- $(use_enable cpu_flags_x86_ssse3 ssse3) \
- $(use_enable cpu_flags_x86_sse4_1 sse41) \
- $(use_enable cpu_flags_x86_sse4_2 sse42) \
- $(use_enable cpu_flags_x86_avx avx) \
- $(use_enable cpu_flags_x86_avx2 avx2) \
- $(use_enable cpu_flags_x86_avx512f avx512f) \
- $(use_enable cpu_flags_x86_avx512dq avx512dq) \
- $(use_enable cpu_flags_x86_avx512vl avx512vl)
-}
-
-src_install() {
- default
- find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/sci-libs/fflas-ffpack/files/fflas-ffpack-2.3.2-blaslapack.patch b/sci-libs/fflas-ffpack/files/fflas-ffpack-2.3.2-blaslapack.patch
deleted file mode 100644
index 3154a2618196..000000000000
--- a/sci-libs/fflas-ffpack/files/fflas-ffpack-2.3.2-blaslapack.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 5b46b18..5e0264a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -248,49 +248,24 @@ dnl echo '**********************************************************************
- dnl exit 1
- dnl ])
-
--BLAS_FOUND=false
--
--FF_CHECK_BLAS_CFLAGS
--FF_CHECK_BLAS_LIBS
--FF_CHECK_MKL
--FF_CHECK_USER_BLAS
--FF_CHECK_USER_LAPACK
--
--FF_OPENBLAS_NUM_THREADS
--
--# FF_CHECK_BLAS
--
--# FF_CHECK_GOTOBLAS
--
--# FF_CHECK_GSL
--
--# if test "$BLAS_FOUND" = "false" ; then
-- # FF_CHECK_CBLAS
--# fi
--
--# if test "$BLAS_FOUND" = "false" ; then
-- # FF_CHECK_OTHERBLAS
--# fi
--
--# FF_CHECK_LAPACK
--
--# if test "$BLAS_FOUND" = "false" ; then
-- # FF_CHECK_BLAS2
--# fi
--
--
--
--# BLAS_LIBS="${BLAS_LIBS}"
--# BLAS_LIBS="-L/${BLAS_PATH} ${LAPACK_LIBS} ${BLAS_LIBS}"
--# AC_SUBST(BLAS_LIBS)
--
--# FF_CHECK_CUDA
--
--# AM_CONDITIONAL(FFLASFFPACK_HAVE_BLAS, test "x$BLAS_FOUND" != "xfalse")
--
--
--# FF_BENCH
--
-+PKG_PROG_PKG_CONFIG
-+
-+PKG_CHECK_MODULES([BLAS], [cblas blas],[
-+ AC_DEFINE(HAVE_BLAS,1,[Define if BLAS is installed])
-+ AC_DEFINE(HAVE_CBLAS,1,[Define if C interface to BLAS is installed])
-+ HAVE_BLAS=yes
-+ BLAS_PATH=""
-+ CBLAS_LIBS="${BLAS_LIBS}"
-+ AC_SUBST(BLAS_LIBS)
-+ AC_SUBST(CBLAS_LIBS)
-+ AC_SUBST(BLAS_CFLAGS)
-+ AC_SUBST(BLAS_PATH)])
-+
-+PKG_CHECK_MODULES([LAPACK], [lapack],[
-+ AC_DEFINE(HAVE_LAPACK,1,[Define if LAPACK is installed])
-+ AC_SUBST(LAPACK_LIBS)])
-+
-+AM_CONDITIONAL(FFLASFFPACK_HAVE_LAPACK, test "x$HAVE_LAPACK" == "x1")
-
- FF_DOC
-
-diff --git a/fflas-ffpack-config.in b/fflas-ffpack-config.in
-index f1dac22..17633a0 100644
---- a/fflas-ffpack-config.in
-+++ b/fflas-ffpack-config.in
-@@ -107,11 +107,11 @@ while test $# -gt 0; do
- ;;
-
- --libs)
-- echo @PARLIBS@ @PRECOMPILE_LIBS@ @BLAS_LIBS@ @GIVARO_LIBS@ # @CUDA_LIBS@
-+ echo @PARLIBS@ @PRECOMPILE_LIBS@ @LAPACK_LIBS@ @BLAS_LIBS@ @GIVARO_LIBS@ # @CUDA_LIBS@
- ;;
-
- --blas-libs)
-- echo @BLAS_LIBS@
-+ echo @LAPACK_LIBS@ @BLAS_LIBS@
- ;;
-
- --blas-home)
diff --git a/sci-libs/fflas-ffpack/files/fflas-ffpack-2.4.3-fix-internal-linking.patch b/sci-libs/fflas-ffpack/files/fflas-ffpack-2.4.3-fix-internal-linking.patch
deleted file mode 100644
index 5f085554c33f..000000000000
--- a/sci-libs/fflas-ffpack/files/fflas-ffpack-2.4.3-fix-internal-linking.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 7c959a3e938a32b386418ddfdfbb884a96762d90 Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Sat, 7 Aug 2021 08:14:44 -0400
-Subject: [PATCH 1/1] fflas-ffpack/interfaces/libs/Makefile.am: fix internal
- linking.
-
-This is just,
-
- https://github.com/linbox-team/fflas-ffpack/pull/339
-
-but rebased onto the old release tarball.
----
- fflas-ffpack/interfaces/libs/Makefile.am | 22 ++++++++--------------
- 1 file changed, 8 insertions(+), 14 deletions(-)
-
-diff --git a/fflas-ffpack/interfaces/libs/Makefile.am b/fflas-ffpack/interfaces/libs/Makefile.am
-index 8c56746..449f6e4 100644
---- a/fflas-ffpack/interfaces/libs/Makefile.am
-+++ b/fflas-ffpack/interfaces/libs/Makefile.am
-@@ -24,7 +24,6 @@ pkgincludesubdir=$(pkgincludedir)/interfaces/libs
-
- AM_CXXFLAGS = @DEFAULT_CFLAGS@
- AM_CPPFLAGS = -I$(top_srcdir) #/fflas-ffpack/utils/ -I$(top_srcdir)/fflas-ffpack/fflas/ -I$(top_srcdir)/fflas-ffpack/ffpack -I$(top_srcdir)/fflas-ffpack/field
--LDADD = $(CBLAS_LIBS) $(GIVARO_LIBS) $(CUDA_LIBS) $(PARFLAGS)
- #AM_LDFLAGS=-static
-
-
-@@ -55,31 +54,26 @@ libfflas_la_SOURCES= fflas_L1_inst.C \
- fflas_L3_inst.C \
- fflas_L3_inst_implem.inl
-
--libfflas_la_LDFLAGS= $(LDADD) -version-info 1:0:0 \
-- -no-undefined
-+libfflas_la_LIBADD= $(CBLAS_LIBS) $(GIVARO_LIBS) $(CUDA_LIBS) $(PARLIBS)
-+libfflas_la_LDFLAGS= -version-info 1:0:0 -no-undefined
-
- libffpack_la_SOURCES= ffpack_inst.C \
- ffpack_inst_implem.inl
--libffpack_la_LDFLAGS= $(LDADD) -version-info 1:0:0 \
-- -no-undefined $(top_builddir)/fflas-ffpack/interfaces/libs/libfflas.la
--
--EXTRA_libffpack_la_DEPENDENCIES= libfflas.la
-+libffpack_la_LIBADD= libfflas.la
-+libffpack_la_LDFLAGS= -version-info 1:0:0 -no-undefined
-
- libfflas_c_la_SOURCES=fflas_lvl1.C \
- fflas_lvl2.C \
- fflas_lvl3.C \
- fflas_sparse.C
- #libfflas_c_la_CPPFLAGS=$(AM_CPPFLAGS) -DFFLAS_COMPILED -DFFPACK_COMPILED
--libfflas_c_la_LDFLAGS= $(LDADD) -version-info 1:0:0 \
-- -no-undefined $(top_builddir)/fflas-ffpack/interfaces/libs/libfflas.la
--
--EXTRA_libfflas_c_la_DEPENDENCIES=libfflas.la
-+libfflas_c_la_LIBADD= libfflas.la
-+libfflas_c_la_LDFLAGS= -version-info 1:0:0 -no-undefined
-
- libffpack_c_la_SOURCES=ffpack.C
- #libffpack_c_la_CPPFLAGS=$(AM_CPPFLAGS) -DFFLAS_COMPILED -DFFPACK_COMPILED
--libffpack_c_la_LDFLAGS= $(LDADD) -version-info 1:0:0 \
-- -no-undefined -lfflas -lffpack
--EXTRA_libffpack_c_la_DEPENDENCIES=libffpack.la
-+libffpack_c_la_LIBADD= libffpack.la
-+libffpack_c_la_LDFLAGS= -version-info 1:0:0 -no-undefined
-
-
- EXTRA_DIST=c_libs.doxy
---
-2.31.1
-
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
deleted file mode 100644
index 48ae6c37166a..000000000000
--- a/sci-libs/fflas-ffpack/files/fflas-ffpack-2.4.3-no-fabi-version.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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
-
diff --git a/sci-libs/fflas-ffpack/files/fflas-ffpack-2.4.3-no-test-fgesv.patch b/sci-libs/fflas-ffpack/files/fflas-ffpack-2.4.3-no-test-fgesv.patch
deleted file mode 100644
index a995c0518566..000000000000
--- a/sci-libs/fflas-ffpack/files/fflas-ffpack-2.4.3-no-test-fgesv.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 3f7a5f601e73491ac7c39cc848fa98fe6224978c Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Mon, 16 Aug 2021 21:19:39 -0400
-Subject: [PATCH 1/1] tests/Makefile.am: disable test-fgesv.
-
-This test can fail on Gentoo, and has been reported upstream. In the
-meantime, having it fail on end users is no good, so we disable it.
-
-Gentoo-bug: https://bugs.gentoo.org/807100
-Upstream-bug: https://github.com/linbox-team/fflas-ffpack/issues/341
----
- tests/Makefile.am | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index 62e92bc..83cf71f 100755
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -63,7 +63,6 @@ BASIC_TESTS = \
- test-io \
- test-maxdelayeddim \
- test-solve \
-- test-fgesv \
- test-simd \
- test-fgemv \
- test-nullspace \
-@@ -143,7 +142,6 @@ test_ftrtri_SOURCES = test-ftrtri.C
- # test_fullranksubmatrix_SOURCES = test-fullranksubmatrix.C
- # test_invert_SOURCES = test-invert.C
- # test_krylov_elim_SOURCES = test-krylov-elim.C
--test_fgesv_SOURCES = test-fgesv.C
- # test_frobenius_SOURCES = test-frobenius.C
- test_nullspace_SOURCES = test-nullspace.C
- test_fdot_SOURCES = test-fdot.C
---
-2.31.1
-
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-07-14 23:22 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-08-07 16:37 [gentoo-commits] repo/gentoo:master commit in: sci-libs/fflas-ffpack/, sci-libs/fflas-ffpack/files/ Michael Orlitzky
-- strict thread matches above, loose matches on Subject: below --
2024-07-14 23:22 Michael Orlitzky
2024-02-18 14:41 Michael Orlitzky
2022-09-02 11:28 Michael Orlitzky
2021-08-07 12:57 Michael Orlitzky
2021-08-07 11:52 Michael Orlitzky
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox