Trac #31588: Update Normaliz to 3.9.x, pynormaliz to 2.17, e-antic to…

… 1.x, add optional package antic Needs: - Add ANTIC package, https://repology.org/project/antic/versions - check boost package - Upgrade e-antic - https://github.com/flatsurf/e-antic/ - Upgrade Normaliz, PyNormaliz We also use this ticket as the target ticket for the ci-sage tests after Normaliz/Normaliz#386 URL: https://trac.sagemath.org/31588 Reported by: mkoeppe Ticket author(s): Matthias Koeppe Reviewer(s): Travis Scrimshaw
sagemath · Oct 9, 2022 · ad120da · ad120da
2 parents fd47b99 + c6778a7
commit ad120da
Show file tree

Hide file tree

Showing 32 changed files with 82 additions and 22 deletions.
diff --git a/build/bin/sage-site b/build/bin/sage-site
@@ -98,7 +98,7 @@ fi
 
 if [ "$1" = '-package' -o "$1" = "--package" ]; then
     shift
-    exec sage-package $@
+    exec sage-package "$@"
 fi
 
 if [ "$1" = '-optional' -o "$1" = "--optional" ]; then

diff --git a/build/pkgs/antic/SPKG.rst b/build/pkgs/antic/SPKG.rst
@@ -0,0 +1,18 @@
+antic: Algebraic Number Theory In C
+===================================
+
+Description
+-----------
+
+Algebraic Number Theory In C
+
+License
+-------
+
+LGPL 2.1
+
+Upstream Contact
+----------------
+
+https://github.com/wbhart/antic
+
diff --git a/build/pkgs/antic/checksums.ini b/build/pkgs/antic/checksums.ini
@@ -0,0 +1,5 @@
+tarball=antic-VERSION.tar.gz
+sha1=940d8ea2c3512b9d49ee3101cf043f777764bd8f
+md5=4e896420dd6344b53b307871efb2cbb4
+cksum=1938565125
+upstream_url=https://github.com/wbhart/antic/archive/refs/tags/vVERSION.tar.gz
diff --git a/build/pkgs/antic/dependencies b/build/pkgs/antic/dependencies
@@ -0,0 +1,4 @@
+$(MP_LIBRARY) mpfr flint
+
+----------
+All lines of this file are ignored except the first.
diff --git a/build/pkgs/antic/distros/arch.txt b/build/pkgs/antic/distros/arch.txt
@@ -0,0 +1 @@
+antic
diff --git a/build/pkgs/antic/distros/conda.txt b/build/pkgs/antic/distros/conda.txt
@@ -0,0 +1 @@
+antic
diff --git a/build/pkgs/antic/distros/debian.txt b/build/pkgs/antic/distros/debian.txt
@@ -0,0 +1 @@
+libantic-dev
diff --git a/build/pkgs/antic/distros/fedora.txt b/build/pkgs/antic/distros/fedora.txt
@@ -0,0 +1 @@
+antic-devel
diff --git a/build/pkgs/antic/distros/freebsd.txt b/build/pkgs/antic/distros/freebsd.txt
@@ -0,0 +1 @@
+math/antic
diff --git a/build/pkgs/antic/distros/opensuse.txt b/build/pkgs/antic/distros/opensuse.txt
@@ -0,0 +1 @@
+antic-devel
diff --git a/build/pkgs/antic/distros/repology.txt b/build/pkgs/antic/distros/repology.txt
@@ -0,0 +1 @@
+antic
diff --git a/build/pkgs/antic/package-version.txt b/build/pkgs/antic/package-version.txt
@@ -0,0 +1 @@
+0.2.5
diff --git a/build/pkgs/antic/spkg-install.in b/build/pkgs/antic/spkg-install.in
@@ -0,0 +1,19 @@
+cd src
+
+# Copied from build/pkgs/flint/spkg-install.in:
+#   Trac #29607: We must always supply --with-gmp, --with-mpfr,
+#   --with-ntl because otherwise FLINT's configure script uses
+#   /usr/local, which is always wrong.
+#   This is why we do not use $SAGE_CONFIGURE_GMP etc. here.
+#   The value $SAGE_LOCAL is always a safe choice even if the library
+#   is coming from the system and is found using what is in
+#   LIBRARY_PATH or LDFLAGS etc.
+./configure \
+    --disable-static \
+    --prefix="$SAGE_LOCAL" \
+    --with-gmp="$SAGE_LOCAL" \
+    --with-mpfr="$SAGE_LOCAL" \
+    --with-flint="$SAGE_LOCAL"  || sdh_die "Error: Failed to configure antic."
+
+sdh_make verbose
+sdh_make_install
diff --git a/build/pkgs/antic/type b/build/pkgs/antic/type
@@ -0,0 +1 @@
+optional
diff --git a/build/pkgs/e_antic/checksums.ini b/build/pkgs/e_antic/checksums.ini
@@ -1,5 +1,5 @@
 tarball=e-antic-VERSION.tar.gz
-sha1=f51d90fcffb2c849eebc1013eb14984f9ad59719
-md5=84ab45f0e1eb3ddbbfb175927506b7bc
-cksum=3161097188
-upstream_url=https://www.labri.fr/perso/vdelecro/e-antic/e-antic-VERSION.tar.gz
+sha1=0fa6ba4a1f13e881f369f9185fe42c7f4bc10a18
+md5=5d77933d78dd08109b0a2c8403892eb6
+cksum=3304746077
+upstream_url=https://github.com/flatsurf/e-antic/releases/download/VERSION/e-antic-VERSION.tar.gz
diff --git a/build/pkgs/e_antic/dependencies b/build/pkgs/e_antic/dependencies
@@ -1,4 +1,4 @@
-$(MP_LIBRARY) flint arb
+$(MP_LIBRARY) flint arb antic boost_cropped
 
 ----------
 All lines of this file are ignored except the first.
diff --git a/build/pkgs/e_antic/distros/arch.txt b/build/pkgs/e_antic/distros/arch.txt
@@ -0,0 +1 @@
+e-antic
diff --git a/build/pkgs/e_antic/distros/debian.txt b/build/pkgs/e_antic/distros/debian.txt
@@ -0,0 +1 @@
+libeantic-dev
diff --git a/build/pkgs/e_antic/distros/fedora.txt b/build/pkgs/e_antic/distros/fedora.txt
@@ -0,0 +1 @@
+e-antic-devel
diff --git a/build/pkgs/e_antic/distros/freebsd.txt b/build/pkgs/e_antic/distros/freebsd.txt
@@ -0,0 +1 @@
+math/e-antic
diff --git a/build/pkgs/e_antic/distros/opensuse.txt b/build/pkgs/e_antic/distros/opensuse.txt
@@ -0,0 +1 @@
+e-antic-devel
diff --git a/build/pkgs/e_antic/package-version.txt b/build/pkgs/e_antic/package-version.txt
@@ -1 +1 @@
-0.1.9
+1.2.1
diff --git a/build/pkgs/e_antic/spkg-install.in b/build/pkgs/e_antic/spkg-install.in
@@ -1,10 +1,6 @@
-###############################################################################
-#
-# e-antic Sage install script
-#
-###############################################################################
 cd src
 
-sdh_configure
+# Following https://github.com/Normaliz/Normaliz/blob/master/install_scripts_opt/install_nmz_e-antic.sh
+sdh_configure --without-byexample --without-doc --without-benchmark --without-pyeantic
 sdh_make
 sdh_make_install
diff --git a/build/pkgs/normaliz/checksums.ini b/build/pkgs/normaliz/checksums.ini
@@ -1,5 +1,5 @@
 tarball=normaliz-VERSION.tar.gz
-sha1=7486d046c5e8e352d6d7c3544a0e6a1164e9b1fd
-md5=136edc12b5c027bb1a019e06fb8d9113
-cksum=1640404889
+sha1=6382fcb14b0e602f5bf7d5abd53b421d0e3a0a3d
+md5=1c6bdd4da166da1718b08a3b9ee40949
+cksum=2272467212
 upstream_url=https://github.com/Normaliz/Normaliz/releases/download/vVERSION/normaliz-VERSION.tar.gz
diff --git a/build/pkgs/normaliz/distros/arch.txt b/build/pkgs/normaliz/distros/arch.txt
@@ -0,0 +1 @@
+normaliz
diff --git a/build/pkgs/normaliz/distros/debian.txt b/build/pkgs/normaliz/distros/debian.txt
@@ -0,0 +1 @@
+libnormaliz-dev
diff --git a/build/pkgs/normaliz/distros/fedora.txt b/build/pkgs/normaliz/distros/fedora.txt
@@ -0,0 +1 @@
+libnormaliz-devel
diff --git a/build/pkgs/normaliz/distros/gentoo.txt b/build/pkgs/normaliz/distros/gentoo.txt
@@ -0,0 +1 @@
+sci-mathematics/normaliz
diff --git a/build/pkgs/normaliz/package-version.txt b/build/pkgs/normaliz/package-version.txt
@@ -1 +1 @@
-3.8.10
+3.9.4
diff --git a/build/pkgs/pynormaliz/checksums.ini b/build/pkgs/pynormaliz/checksums.ini
@@ -1,5 +1,5 @@
 tarball=PyNormaliz-VERSION.tar.gz
-sha1=f24f5c4a1b9b7a084ad1f2a0b95374d1a83e31b2
-md5=51e67733702d6cea3cd81144888d9dc7
-cksum=3201946747
+sha1=de8771b0339c4567665331df221c880bfe2b69a2
+md5=e8a571bdc3a8fcad16fdfabf9a6874d3
+cksum=2734845416
 upstream_url=https://pypi.io/packages/source/p/pynormaliz/PyNormaliz-VERSION.tar.gz
diff --git a/build/pkgs/pynormaliz/install-requires.txt b/build/pkgs/pynormaliz/install-requires.txt
@@ -1 +1 @@
-pynormaliz ==2.14
+pynormaliz ==2.12
diff --git a/build/pkgs/pynormaliz/package-version.txt b/build/pkgs/pynormaliz/package-version.txt
@@ -1 +1 @@
-2.14
+2.17