diff --git a/build/pkgs/sirocco/checksums.ini b/build/pkgs/sirocco/checksums.ini index 19cbe71816c..66c87fe855a 100644 --- a/build/pkgs/sirocco/checksums.ini +++ b/build/pkgs/sirocco/checksums.ini @@ -1,4 +1,4 @@ tarball=libsirocco-VERSION.tar.gz -sha1=23311c0944f0c128b493589c1575476cf88177b6 -sha256=e86c9fe3b1f2cf0d3a7381d21c1fc4670f14b538c60c7cc6410ccb0f5b1fbaf8 +sha1=e3272f4a86a73854fe69b26c17f01525d8171378 +sha256=83d1dd5622120eda42c475696235dd67be8072a76baad0a70693d9743a659a61 upstream_url=https://github.com/miguelmarco/SIROCCO2/releases/download/VERSION/libsirocco-VERSION.tar.gz diff --git a/build/pkgs/sirocco/package-version.txt b/build/pkgs/sirocco/package-version.txt index 7ec1d6db408..3e3c2f1e5ed 100644 --- a/build/pkgs/sirocco/package-version.txt +++ b/build/pkgs/sirocco/package-version.txt @@ -1 +1 @@ -2.1.0 +2.1.1 diff --git a/build/pkgs/sirocco/spkg-configure.m4 b/build/pkgs/sirocco/spkg-configure.m4 new file mode 100644 index 00000000000..82b49d8e970 --- /dev/null +++ b/build/pkgs/sirocco/spkg-configure.m4 @@ -0,0 +1,30 @@ +SAGE_SPKG_CONFIGURE([sirocco], [ + SAGE_SPKG_DEPCHECK([mpfr], [ + PKG_CHECK_MODULES([libsirocco], [libsirocco >= 2.1.0], [ + AC_MSG_RESULT([found libsirocco >= 2.1.0, will use installed version]) + ],[ + AC_MSG_RESULT([couldn't find libsirocco >= 2.1.0. Trying to find an instance without pkg-config]) + AC_CHECK_HEADER([sirocco.h], [ + BACKUP_LIBS=${LIBS} + LIBS="${LIBS} -lmpfr -lsirocco" + AC_LINK_IFELSE([ + AC_LANG_PROGRAM( + [[#include + ]], [[ + double tcoefs[]={-2.,2.}; + homotopyPath(2, tcoefs, 1., 0.); + ]])], [ + AC_MSG_RESULT([yes]) + ], [ + AC_MSG_RESULT([no]) + sage_spkg_install_sirocco=yes + ], [ + dnl assume that the person running cross-compiling + dnl knows what they are doing + AC_MSG_RESULT([yes]) + ]) + LIBS=${BACKUP_LIBS} + ], [sage_spkg_install_sirocco=yes]) + ]) + ]) +])