summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Orlitzky <mjo@gentoo.org>2024-07-14 19:06:59 -0400
committerMichael Orlitzky <mjo@gentoo.org>2024-07-14 19:21:29 -0400
commitc1d22f0434a0c8c4afac29987671b82248f1f9a4 (patch)
tree539b3f1ed363e45b513d503de56d07524549bc6d /sci-libs
parentsci-libs/linbox: drop 1.6.3-r2 (diff)
downloadgentoo-c1d22f0434a0c8c4afac29987671b82248f1f9a4.tar.gz
gentoo-c1d22f0434a0c8c4afac29987671b82248f1f9a4.tar.bz2
gentoo-c1d22f0434a0c8c4afac29987671b82248f1f9a4.zip
sci-libs/fflas-ffpack: drop 2.4.3-r3
Signed-off-by: Michael Orlitzky <mjo@gentoo.org>
Diffstat (limited to 'sci-libs')
-rw-r--r--sci-libs/fflas-ffpack/Manifest1
-rw-r--r--sci-libs/fflas-ffpack/fflas-ffpack-2.4.3-r3.ebuild73
-rw-r--r--sci-libs/fflas-ffpack/files/fflas-ffpack-2.3.2-blaslapack.patch90
-rw-r--r--sci-libs/fflas-ffpack/files/fflas-ffpack-2.4.3-fix-internal-linking.patch70
-rw-r--r--sci-libs/fflas-ffpack/files/fflas-ffpack-2.4.3-no-fabi-version.patch31
-rw-r--r--sci-libs/fflas-ffpack/files/fflas-ffpack-2.4.3-no-test-fgesv.patch37
6 files changed, 0 insertions, 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
-