Skip to content

Commit

Permalink
Trac #29631: spkg-configure.m4 for linbox
Browse files Browse the repository at this point in the history
This ticket adds an `spkg-configure.m4` for linbox, in order to use it
from a system package if possible (see #27330).

Note for packagers: by default, linbox produces a buggy `linbox.pc`, and
`@LINBOXSAGE_LIBS@` must be removed from their `linbox.pc.in` (see
#27205).

No more problem after that.

URL: https://trac.sagemath.org/29631
Reported by: gh-thierry-FreeBSD
Ticket author(s): Thierry Thomas, Michael Orlitzky, Samuel Lelièvre
Reviewer(s): Dima Pasechnik
  • Loading branch information
Release Manager committed Mar 12, 2022
2 parents 55a711e + bc7a6f8 commit a61c15e
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 7 deletions.
1 change: 1 addition & 0 deletions build/pkgs/fplll/distros/debian.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
libfplll-dev
2 changes: 1 addition & 1 deletion build/pkgs/linbox/dependencies
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
1 change: 1 addition & 0 deletions build/pkgs/linbox/distros/fedora.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
linbox
1 change: 1 addition & 0 deletions build/pkgs/linbox/distros/gentoo.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
sci-libs/linbox
8 changes: 8 additions & 0 deletions build/pkgs/linbox/spkg-configure.m4
Original file line number Diff line number Diff line change
@@ -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 linbox <= 1.6.4],
[sage_spkg_install_linbox=no],
[sage_spkg_install_linbox=yes])
])
])
6 changes: 0 additions & 6 deletions build/pkgs/linbox/spkg-install.in
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions build/pkgs/m4ri/distros/debian.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
libm4ri-dev

0 comments on commit a61c15e

Please sign in to comment.