From 9a8bf641fb776aab6127f5e7e5c844f279323415 Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Tue, 5 May 2020 07:33:18 -0400 Subject: [PATCH 1/7] Trac #29631: don't force SHELL=bash when installing linbox. This workaround is no longer needed, as I'm regularly installing linbox-1.6.3 with /bin/sh -> /bin/dash. --- build/pkgs/linbox/spkg-install.in | 6 ------ 1 file changed, 6 deletions(-) diff --git a/build/pkgs/linbox/spkg-install.in b/build/pkgs/linbox/spkg-install.in index 66f87b47d21..a2ad194837a 100644 --- a/build/pkgs/linbox/spkg-install.in +++ b/build/pkgs/linbox/spkg-install.in @@ -23,12 +23,6 @@ fi # See trac ticket #21221. LINBOX_CONFIGURE="--without-fplll $LINBOX_CONFIGURE" -# Need to use 'bash' for configure, see -# https://trac.sagemath.org/ticket/23451 -if [ -z "$CONFIG_SHELL" ]; then - export CONFIG_SHELL=`command -v bash` -fi - # We disable openmp because of build failures, see # http://trac.sagemath.org/ticket/17635#comment:67 # We disable ocl because of build failures, see From 9f788f583f6daafabc1fc4944721e04bc5cbd6d7 Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Tue, 5 May 2020 07:34:27 -0400 Subject: [PATCH 2/7] Trac #29631: drop fplll from linbox's dependencies. The spkg-install.in for linbox passes --without-fplll to its ./configure script, meaning that fplll is ultimately not used by linbox. The "fplll" entry in linbox's "dependencies" file is therefore obsolete. This commit removes it. --- build/pkgs/linbox/dependencies | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/pkgs/linbox/dependencies b/build/pkgs/linbox/dependencies index fab91c525f8..98b93071996 100644 --- a/build/pkgs/linbox/dependencies +++ b/build/pkgs/linbox/dependencies @@ -1,4 +1,4 @@ -$(MP_LIBRARY) ntl givaro mpfr fplll iml flint fflas_ffpack +$(MP_LIBRARY) ntl givaro mpfr iml flint fflas_ffpack ---------- All lines of this file are ignored except the first. From 796b0c3009ca51e2d64ddc65175f0d0a008652b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20Leli=C3=A8vre?= Date: Mon, 22 Mar 2021 02:14:30 +0100 Subject: [PATCH 3/7] 29361: Add Fedora and Gentoo linbox package info --- build/pkgs/linbox/distros/fedora.txt | 1 + build/pkgs/linbox/distros/gentoo.txt | 1 + 2 files changed, 2 insertions(+) create mode 100644 build/pkgs/linbox/distros/fedora.txt create mode 100644 build/pkgs/linbox/distros/gentoo.txt diff --git a/build/pkgs/linbox/distros/fedora.txt b/build/pkgs/linbox/distros/fedora.txt new file mode 100644 index 00000000000..891a35cb224 --- /dev/null +++ b/build/pkgs/linbox/distros/fedora.txt @@ -0,0 +1 @@ +linbox diff --git a/build/pkgs/linbox/distros/gentoo.txt b/build/pkgs/linbox/distros/gentoo.txt new file mode 100644 index 00000000000..fbbc84fe277 --- /dev/null +++ b/build/pkgs/linbox/distros/gentoo.txt @@ -0,0 +1 @@ +sci-libs/linbox From 9b7d1ec21ef72ea656bb7b7094a3231fff2fe688 Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Fri, 12 Nov 2021 10:07:44 -0500 Subject: [PATCH 4/7] Trac #29631: new spkg-configure.m4 for linbox. This is essentially the file posted as an attachment on Trac 29631 by Thierry Thomas. I've chosen to leave the lower bound at the latest v1.6.3, since in the intervening months most distributions appear to have updated. --- build/pkgs/linbox/spkg-configure.m4 | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 build/pkgs/linbox/spkg-configure.m4 diff --git a/build/pkgs/linbox/spkg-configure.m4 b/build/pkgs/linbox/spkg-configure.m4 new file mode 100644 index 00000000000..fbf405c9a4b --- /dev/null +++ b/build/pkgs/linbox/spkg-configure.m4 @@ -0,0 +1,8 @@ +SAGE_SPKG_CONFIGURE([linbox], [ + SAGE_SPKG_DEPCHECK([fflas-ffpack flint fplll givaro gmp iml m4ri m4rie mpfr ntl], [ + PKG_CHECK_MODULES([LINBOX], + [linbox >= 1.6.3], + [], + [sage_spkg_install_linbox=yes]) + ]) +]) From a5d8c7204d643bf6a975cf717807abd962f7137d Mon Sep 17 00:00:00 2001 From: Dima Pasechnik Date: Sun, 5 Dec 2021 10:59:34 +0000 Subject: [PATCH 5/7] correct the package name: `-`->`_` --- build/pkgs/linbox/spkg-configure.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/pkgs/linbox/spkg-configure.m4 b/build/pkgs/linbox/spkg-configure.m4 index fbf405c9a4b..f54b2109ddc 100644 --- a/build/pkgs/linbox/spkg-configure.m4 +++ b/build/pkgs/linbox/spkg-configure.m4 @@ -1,5 +1,5 @@ SAGE_SPKG_CONFIGURE([linbox], [ - SAGE_SPKG_DEPCHECK([fflas-ffpack flint fplll givaro gmp iml m4ri m4rie mpfr ntl], [ + SAGE_SPKG_DEPCHECK([fflas_ffpack flint fplll givaro gmp iml m4ri m4rie mpfr ntl], [ PKG_CHECK_MODULES([LINBOX], [linbox >= 1.6.3], [], From 4d41356d6fd2aecafafec0c682a3c0503f02e091 Mon Sep 17 00:00:00 2001 From: Dima Pasechnik Date: Tue, 14 Dec 2021 06:18:49 +0100 Subject: [PATCH 6/7] 29631: add fplll and libm4ri debian distro info --- build/pkgs/fplll/distros/debian.txt | 1 + build/pkgs/m4ri/distros/debian.txt | 1 + 2 files changed, 2 insertions(+) create mode 100644 build/pkgs/fplll/distros/debian.txt diff --git a/build/pkgs/fplll/distros/debian.txt b/build/pkgs/fplll/distros/debian.txt new file mode 100644 index 00000000000..9f9707f6601 --- /dev/null +++ b/build/pkgs/fplll/distros/debian.txt @@ -0,0 +1 @@ +libfplll-dev diff --git a/build/pkgs/m4ri/distros/debian.txt b/build/pkgs/m4ri/distros/debian.txt index e69de29bb2d..4e0eaaba30a 100644 --- a/build/pkgs/m4ri/distros/debian.txt +++ b/build/pkgs/m4ri/distros/debian.txt @@ -0,0 +1 @@ +libm4ri-dev From bc7a6f8d2b2b79094998dbc63d33adb01fc021cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20Leli=C3=A8vre?= Date: Sun, 19 Dec 2021 21:29:57 +0100 Subject: [PATCH 7/7] 29631: upper bound for linbox version --- build/pkgs/linbox/spkg-configure.m4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/pkgs/linbox/spkg-configure.m4 b/build/pkgs/linbox/spkg-configure.m4 index f54b2109ddc..1571c9de790 100644 --- a/build/pkgs/linbox/spkg-configure.m4 +++ b/build/pkgs/linbox/spkg-configure.m4 @@ -1,8 +1,8 @@ SAGE_SPKG_CONFIGURE([linbox], [ SAGE_SPKG_DEPCHECK([fflas_ffpack flint fplll givaro gmp iml m4ri m4rie mpfr ntl], [ PKG_CHECK_MODULES([LINBOX], - [linbox >= 1.6.3], - [], + [linbox >= 1.6.3 linbox <= 1.6.4], + [sage_spkg_install_linbox=no], [sage_spkg_install_linbox=yes]) ]) ])