diff options
Diffstat (limited to 'sci-libs/fflas-ffpack')
| -rw-r--r-- | sci-libs/fflas-ffpack/Manifest | 5 | ||||
| -rw-r--r-- | sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r2.ebuild (renamed from sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r1.ebuild) | 10 | ||||
| -rw-r--r-- | sci-libs/fflas-ffpack/files/fflas-ffpack-2.4.3-fix-internal-linking.patch | 70 | ||||
| -rw-r--r-- | sci-libs/fflas-ffpack/files/fflas-ffpack-2.4.3-no-fabi-version.patch | 31 | ||||
| -rw-r--r-- | sci-libs/fflas-ffpack/files/fflas-ffpack-2.4.3-no-test-echelon.patch | 39 |
5 files changed, 153 insertions, 2 deletions
diff --git a/sci-libs/fflas-ffpack/Manifest b/sci-libs/fflas-ffpack/Manifest index eef827d8692f..0a60947a99ff 100644 --- a/sci-libs/fflas-ffpack/Manifest +++ b/sci-libs/fflas-ffpack/Manifest @@ -1,4 +1,7 @@ AUX fflas-ffpack-2.3.2-blaslapack.patch 1981 BLAKE2B 9813b99bb5c616608500189e2f54392b5240cfa75bb0ebb946ec74ed8491a8c51e205aa22a34b2fde961b3a817f06124dc6fd6d2737c2e557203b323e371bdfb SHA512 7c8d7380f1d6ee8cce18ef3cdb792066d246263922cccbee739b68e1c2e2e117d4a70108cf29ac0f29ebb286eaafc86215661395eb5016f95f8852917c9831ec +AUX fflas-ffpack-2.4.3-fix-internal-linking.patch 2599 BLAKE2B f0bdb27bc8fdc62661c651f6d292774b5c130dadcec39116eceb65e09a771218a83eadb4986285477edb10c7b273629f9bf91cb43449f137f18310c347dae0a3 SHA512 5ab624546d52833fa5797890520771718ee89127149dc208f3e0cd4b1399741724576949b824539bc6612b625ce64a00a903ba3ac003d2c85104a1faf10f1434 +AUX fflas-ffpack-2.4.3-no-fabi-version.patch 1170 BLAKE2B 90e9c080291251d4a5231c3857385791a5c24c00ee2327192fd1c5dcb1a169ad97fa50d21124f054737dd6a1dd1c5c10377865b5b144b31eed728dedc89ea001 SHA512 8d6b3c9bd6637f1c3bf43ce722e96bd9e48b0e271cec1fb4ae72ab2e99ac7b436626385dd2e39781959248506c19474ac062c8ced2c63db80553150f8e7a0287 +AUX fflas-ffpack-2.4.3-no-test-echelon.patch 1374 BLAKE2B f62631e7e4e358584a826fb5ec3e9f36b892b5f0636c965677c55a97901ffefe3ad47dea79c46d65bb3090668e335d4f7cfc04cd12bc2b72f1c3c7db45833108 SHA512 9c9ee6e7df7d04fcc5ffc84cd3a2dae08e960540371671cc79c4eb99606bc1fd150a6e0ad96f16a51904ff83fabe69bdc9bfc6e9603855fe21acea535fc31dc1 DIST fflas-ffpack-2.4.3.tar.gz 1059033 BLAKE2B e416429bb426a81cf9c25d54c83380ff9a9d658c711da06e6359d968843d4d9d26cf8389379f9ad4a5cbcee93e0afc9fe0497bb7a8f190e0c72c0b1f7b67de18 SHA512 c7620ba5a92e4114a581a6bea32267f9d5a9f0eb7e23fc0a7a97ce4b8124bb7b29f89ff2ad6ad270d97c76489625b57a354e581905b74ee57b35f4ca3e196a44 -EBUILD fflas-ffpack-2.4.3-r1.ebuild 1892 BLAKE2B 632fce6f5aac5d0342e96384f1a07eea68d1a6a1a74f3c8f323fc35d9ba361a15e3c2c99dac0cad8638900f048b295f68f39cc2fec7d564dbca0df145871f9a4 SHA512 7248e81aaa731c55d8f1319cce2b6e5048a8033bad2e2f9839700b5d647c2f87e5b181b734567636c92055bb3e5dfaaf1b9333165637f294b35c4f0579912d7b +EBUILD fflas-ffpack-2.4.3-r2.ebuild 2172 BLAKE2B 54ab4c5f568b867f628df6b2b3497f9b70e32f418cce3a7e775527687a8e466cb975cfb3b8447aa72610a26d13e2ed27c5441f95afdba39a7665c621df75a7f5 SHA512 abef19562794d717f84b171a5686dd9dfb62fc6fa62a017fa8a1e3de6f2b5bb250471da5fa501a6e4b3f1a9a52014dc32a3fa6c6cd9e06a32eb4f0b82033c8d9 MISC metadata.xml 1491 BLAKE2B a26497a0f046e8103c7c5ac8ea835373d4c30d2ec2114fc75aff3cbf72155d492dd09b78ee0ef869ae9d717ff00cb84913f21f2b645e2108889fc873afaa1d88 SHA512 da5ec89287e1a22903fb283bc37caa99e90c56fc2163ef7cf7dafc657f72d69325f627c95371ceb8561a18fd95a1df40db4f8c762d5663f7cb2c2ad97e39563b 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 574fe036ecf0..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 @@ -23,7 +23,15 @@ 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" + "${FILESDIR}/${P}-fix-internal-linking.patch" + "${FILESDIR}/${P}-no-fabi-version.patch" +) pkg_pretend() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp 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 000000000000..5f085554c33f --- /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 + 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 + 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 000000000000..0b8b68fa6093 --- /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 + |