diff --git a/build/pkgs/configure/checksums.ini b/build/pkgs/configure/checksums.ini index e4bbf930fe7..67f59cebd84 100644 --- a/build/pkgs/configure/checksums.ini +++ b/build/pkgs/configure/checksums.ini @@ -1,3 +1,3 @@ tarball=configure-VERSION.tar.gz -sha1=dca19f73642b76f1f96b860bb6603499f586380d -sha256=843e060687a9a2360ea3e9499e5c20eb744fcfc2acd4b13c01444ecd961fd43e +sha1=3fedb98368bb646b6b35bdfab27c488d19bc9ee5 +sha256=f78c25c5b8ffcaf9a21ae7e34f7f0c494e6ed1223888313cfed31a89af9d8609 diff --git a/build/pkgs/configure/package-version.txt b/build/pkgs/configure/package-version.txt index 8da0a664f61..29e5beb23a9 100644 --- a/build/pkgs/configure/package-version.txt +++ b/build/pkgs/configure/package-version.txt @@ -1 +1 @@ -f5e78840b108412e1e26382910af993f874c6933 +410c70f9451f4c7bef080bf028adb5041322ea55 diff --git a/build/pkgs/fflas_ffpack/spkg-install.in b/build/pkgs/fflas_ffpack/spkg-install.in index b9dd851875f..6fa14426ca1 100644 --- a/build/pkgs/fflas_ffpack/spkg-install.in +++ b/build/pkgs/fflas_ffpack/spkg-install.in @@ -29,6 +29,13 @@ if [ -z "$CONFIG_SHELL" ]; then export CONFIG_SHELL=`command -v bash` fi +# Dirty workaround to link on OSX +# https://github.com/linbox-team/fflas-ffpack/issues/391 +# https://github.com/sagemath/sage/issues/38002 +if [ "$UNAME" = Darwin ]; then + LDFLAGS="-lgivaro $LDFLAGS" +fi + # We disable openmp because of build failures, see # https://github.com/sagemath/sage/issues/17635#comment:67 sdh_configure --with-default="$SAGE_LOCAL" --with-blas-libs="$LINBOX_BLAS" \ diff --git a/build/pkgs/linbox/patches/310-backport.patch b/build/pkgs/linbox/patches/310-backport.patch index c0c44bc1ec7..986ac298ce2 100644 --- a/build/pkgs/linbox/patches/310-backport.patch +++ b/build/pkgs/linbox/patches/310-backport.patch @@ -27,7 +27,7 @@ index 59006d6c5f..2604f47b81 100644 + const_cast(_data_beg) = iter._data_beg ; + const_cast(_data_end) = iter._data_end ; + const_cast(_field) = iter._field ; -+ const_cast(ld) = iter._ld ; ++ const_cast(_ld) = iter._ld ; _row = iter._row ; return *this; @@ -48,7 +48,7 @@ index 498a5525db..a60943868b 100644 + const_cast(_data_end)= iter._data_end ; + const_cast(_field) = iter._field ; + const_cast&>(_rowid) = iter._rowid; -+ const_cast(ld) = iter._ld ; ++ const_cast(_ld) = iter._ld ; _row = iter._row ; return *this; @@ -63,7 +63,7 @@ index 498a5525db..a60943868b 100644 + const_cast(_data_beg) = iter._data_beg ; + const_cast(_data_end) = iter._data_end ; + const_cast(_field) = iter._field ; -+ const_cast(ld)= iter._ld ; ++ const_cast(_ld)= iter._ld ; _row = iter._row ; return *this;