move zlib to prereqs, remove zlib spkg

COPYING.txt

@@ -69,7 +69,7 @@ jmol                        LGPLv2.1+
 jsonschema                  MIT License
 lcalc                       GPLv2+
 libgap                      GPLv3+
-libpng                      Custom, very similar to zlib
+libpng                      Custom (modified BSD)
 linbox                      LGPLv2.1+
 lrcalc                      GPLv2+
 m4ri                        GPLv2+
@@ -124,7 +124,6 @@ sympy                       Modified BSD
 tachyon                     Modified BSD
 threejs                     MIT License
 tornado                     Apache License
-zlib                        Custom (Modified BSD)
 
 CONTACT INFO:
      William Stein; [email protected];
@@ -1314,30 +1313,3 @@ modification, are permitted provided that the following conditions are met:
 [followed by the BSD disclaimer]
 
 ================================================================================
-
-zlib:
-GPL compatible according to
-  http://www.fsf.org/licensing/licenses/index_html#GPLCompatibleLicenses
-
-Copyright (C) 1995-2004 Jean-loup Gailly and Mark Adler
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jean-loup Gailly [email protected]
-  Mark Adler [email protected]
-
-===============================================================================

README.md

@@ -526,7 +526,7 @@ SAGE_ROOT                 Root directory (create by git clone)
 │   └── pkgs              Every package is a subdirectory here
 │       ├── 4ti2/
 │       …
-│       └── zlib/
+│       └── zipp/
 ├── configure             Top-level configure script
 ├── COPYING.txt           Copyright information
 ├── pkgs                  Source trees of Python distribution packages
@@ -570,7 +570,7 @@ SAGE_ROOT                 Root directory (create by git clone)
 │   └── pkgs              Build logs of individual packages
 │       ├── alabaster-0.7.12.log
 │       …
-│       └── zlib-1.2.11.log
+│       └── zipp-3.19.0.log
 ├── m4                    M4 macros for generating the configure script
 │   └── *.m4
 ├── Makefile              Running "make" uses this file
@@ -584,7 +584,7 @@ SAGE_ROOT                 Root directory (create by git clone)
 ├── upstream              Source tarballs of packages
 │   ├── Babel-2.9.1.tar.gz
 │   …
-│   └── zlib-1.2.11.tar.gz
+│   └── zipp-3.19.0-py3-none-any.whl
 ├── venv -> SAGE_VENV     Convenience symlink to the virtual environment
 └── VERSION.txt
 ```

build/bin/sage-package

@@ -17,7 +17,6 @@
 #   4ti2
 #   autotools
 #   [...]
-#   zlib
 #
 # * Find the package name given a tarball filename
 #

build/make/Makefile.in

@@ -313,7 +313,7 @@ toolchain: $(foreach pkgname,$(TOOLCHAIN),$(inst_$(pkgname))) $(PCFILES)
 # See #14168 and #14232.
 #
 # Note: This list consists of only the *runtime* dependencies of the toolchain.
-TOOLCHAIN_DEPS = zlib $(MP_LIBRARY) mpfr mpc
+TOOLCHAIN_DEPS = $(MP_LIBRARY) mpfr mpc
 TOOLCHAIN_DEP_INSTS = \
 	$(foreach pkgname,$(TOOLCHAIN_DEPS),$(inst_$(pkgname)))
 
@@ -569,7 +569,7 @@ pkg_deps = \
 #
 # For example, for python3 this will expand to:
 #
-# $(INST)/python3-3.7.3: $(inst_zlib) $(inst_readline) $(inst_sqlite) $(inst_libpng) $(inst_xz) $(inst_libffi)
+# $(INST)/python3-3.7.3: $(inst_readline) $(inst_sqlite) $(inst_libpng) $(inst_xz) $(inst_libffi)
 #     +$(AM_V_at)sage-logger -p '$(SAGE_SPKG) python3-3.7.3' '$(SAGE_LOGS)/python3-3.7.3.log'
 #
 # python3: $(INST)/python3-3.7.3

build/pkgs/4ti2/dependencies

@@ -1,4 +1,4 @@
-zlib $(MP_LIBRARY) glpk
+$(MP_LIBRARY) glpk
 
 ----------
 All lines of this file are ignored except the first.

build/pkgs/4ti2/spkg-configure.m4

@@ -1,5 +1,5 @@
 SAGE_SPKG_CONFIGURE([4ti2], [
-    SAGE_SPKG_DEPCHECK([gmp glpk zlib], [
+    SAGE_SPKG_DEPCHECK([gmp glpk], [
         dnl Debian installs these programs with an executable prefix "4ti2-",
         dnl OpenSUSE uses the prefix "4ti2_".
         dnl Singular checks for unprefixed and prefixed with "4ti2-".

build/pkgs/_prereq/SPKG.rst

@@ -25,6 +25,10 @@ computer:
   (some Linux distros package these separately, e.g. Debian/Ubuntu needs
   packages ``bzip2`` and ``libbz2-dev``; Fedora needs ``bzip2`` and ``bzip2-devel``.)
 - **pkgconf**, also known as ``pkg-config``.
+- **zlib**: the library ``libz`` with its headers, and its pkg-config zlib.pc file.
+  (some Linux distros package these separately.)
+  On macOS we provide a basic zlib.pc file in build/platform/macos/pkgconfig,
+  which, if needed, gets prepended to PKG_CONFIG_PATH by ./configure.
 
 Other versions of these may work, but they are untested.
 

build/pkgs/_prereq/distros/alpine.txt

@@ -22,3 +22,4 @@ patch
 bzip2
 patch
 pkgconf
+zlib-dev

build/pkgs/_prereq/distros/arch.txt

@@ -20,3 +20,4 @@ bzip2
 which
 patch
 pkgconf
+zlib

build/pkgs/_prereq/distros/conda.txt

@@ -17,3 +17,5 @@ bc
 patch
 bzip2
 pkg-config
+zlib
+zlib-devel

build/pkgs/_prereq/distros/debian.txt

@@ -31,3 +31,4 @@ g++
 ca-certificates
 patch
 pkg-config
+libz-dev

build/pkgs/_prereq/distros/fedora.txt

@@ -35,3 +35,4 @@ perl-IPC-Cmd
 flex
 patch
 pkg-config
+zlib-devel

build/pkgs/_prereq/distros/freebsd.txt

@@ -20,3 +20,4 @@ patch
 bzip2
 patch
 devel/pkgconf
+zlib

build/pkgs/_prereq/distros/gentoo.txt

@@ -31,3 +31,4 @@ sys-devel/patch
 app-arch/bzip2
 sys-devel/patch
 dev-util/pkgconf
+sys-libs/zlib

build/pkgs/_prereq/distros/homebrew.txt

@@ -8,3 +8,4 @@
 # Everything on a line after a # character is ignored.
 #
 pkgconf
+zlib

build/pkgs/_prereq/distros/macports.txt

@@ -9,3 +9,4 @@
 #
 # Everything on a line after a # character is ignored.
 pkgconfig
+zlib

build/pkgs/_prereq/distros/nix.txt

@@ -20,3 +20,4 @@ gnupatch
 bzip2
 gnupatch
 pkg-config
+zlib

build/pkgs/_prereq/distros/opensuse.txt

@@ -32,3 +32,4 @@ bzip2
 pkgconfig(bzip2)
 patch
 pkgconf
+pkgconfig(zlib)

build/pkgs/_prereq/distros/slackware.txt

@@ -32,3 +32,4 @@ patch
 bzip2
 patch
 pkg-config
+zlib

build/pkgs/cbc/dependencies

@@ -1,4 +1,4 @@
-readline zlib $(BLAS)
+readline $(BLAS)
 
 ----------
 All lines of this file are ignored except the first.

build/pkgs/cbc/spkg-configure.m4

@@ -1,5 +1,5 @@
 SAGE_SPKG_CONFIGURE([cbc], [
-    SAGE_SPKG_DEPCHECK([openblas zlib], [
+    SAGE_SPKG_DEPCHECK([openblas], [
         dnl  checking with pkg-config
         PKG_CHECK_MODULES([CBC], [cbc >= 2.9.4], [], [sage_spkg_install_cbc=yes])
     ])

build/pkgs/cmake/dependencies

@@ -1,4 +1,4 @@
-curl zlib liblzma
+curl liblzma
 
 ----------
 All lines of this file are ignored except the first.

build/pkgs/gap/dependencies

@@ -1,4 +1,4 @@
-ncurses readline zlib $(MP_LIBRARY)
+ncurses readline $(MP_LIBRARY)
 
 ----------
 All lines of this file are ignored except the first.

build/pkgs/gap/spkg-configure.m4

@@ -5,7 +5,7 @@ SAGE_SPKG_CONFIGURE([gap], [
   m4_pushdef([GAP_MINVER],["4.13.0"])
   m4_pushdef([GAP_LTVER],["5.0.0"])
 
-  SAGE_SPKG_DEPCHECK([ncurses readline zlib], [
+  SAGE_SPKG_DEPCHECK([ncurses readline], [
     AC_PATH_PROG(GAP, gap)
     AS_IF([test -n "${GAP}"], [
       AC_MSG_CHECKING([for gap version >= GAP_MINVER, < GAP_LTVER])

build/pkgs/gcc/dependencies

@@ -1,4 +1,4 @@
-| $(MP_LIBRARY) mpfr mpc zlib xz
+| $(MP_LIBRARY) mpfr mpc xz
 
 ------------------------------------------------------------------------
 NOTE: all dependencies of GCC must be order-only dependencies

build/pkgs/glpk/dependencies

@@ -1,4 +1,4 @@
-$(MP_LIBRARY) zlib
+$(MP_LIBRARY)
 
 ----------
 All lines of this file are ignored except the first.

build/pkgs/glpk/spkg-configure.m4

@@ -1,6 +1,6 @@
 SAGE_SPKG_CONFIGURE([glpk], [
     m4_pushdef([SAGE_GLPK_MINVER],["4.63"])
-    SAGE_SPKG_DEPCHECK([gmp zlib], [
+    SAGE_SPKG_DEPCHECK([gmp], [
         AC_PATH_PROG([GLPSOL], [glpsol])
         AS_IF([test x$GLPSOL = x], [
            AC_MSG_NOTICE([glpsol not found. Installing glpk])

build/pkgs/glpk/spkg-install.in

@@ -5,10 +5,8 @@ cp "$SAGE_ROOT"/config/config.* .
 
 # Note: The following doesn't work with spaces in `$SAGE_LOCAL`, but we don't
 #       support that anyway, since many upstream packages don't.
-#       On the other hand, the only packages GLPK uses that Sage provides are
-#       GMP and zlib, so we should just use `$SAGE_CONFIGURE_GMP` and
-#       `--with-zlib="$SAGE_LOCAL"` below (which is safe), and omit the fol-
-#       lowing two lines. (TODO)
+#       On the other hand, the only package GLPK uses that Sage provides is 
+#       GMP, so we should just use `$SAGE_CONFIGURE_GMP`
 #
 #       Turns out that (as of version 4.55)
 #          `configure` doesn't support specifying the location of the GMP

build/pkgs/glucose/dependencies

@@ -1,4 +1,4 @@
-zlib
+
 
 ----------
 All lines of this file are ignored except the first.

build/pkgs/libgd/spkg-install.in

@@ -10,6 +10,6 @@ sdh_configure --without-jpeg --without-xpm --without-x --without-fontconfig \
               --without-avif --without-freetype --without-raqm --without-liq \
               --without-tiff --without-webp --without-heif \
               --disable-gd-formats \
-              --with-zlib="$SAGE_LOCAL" $LIBGD_CONFIGURE
+              $LIBGD_CONFIGURE
 sdh_make
 sdh_make_install

build/pkgs/libpng/dependencies

@@ -1,4 +1,4 @@
-zlib
+
 
 ----------
 All lines of this file are ignored except the first.

build/pkgs/libpng/spkg-configure.m4

@@ -1,11 +1,4 @@
 SAGE_SPKG_CONFIGURE([libpng], [
-    AC_REQUIRE([SAGE_SPKG_CONFIGURE_ZLIB])
-    AC_MSG_CHECKING([installing zlib? ])
-    if test x$sage_spkg_install_zlib = xyes; then
-      AC_MSG_RESULT([yes; install libpng as well])
-      sage_spkg_install_libpng=yes
-    else
-      AC_MSG_RESULT([no])
       dnl First try checking for libpng with pkg-config
       PKG_CHECK_MODULES([LIBPNG], [libpng >= 1.2], [], [
         sage_spkg_install_libpng=yes
@@ -16,5 +9,4 @@ SAGE_SPKG_CONFIGURE([libpng], [
         dnl So we would have to tell them about the libpng that we found,
         dnl for example by creating a facade .pc file like we do for BLAS.
       ])
-    fi
 ])

build/pkgs/libxml2/dependencies

@@ -1,4 +1,4 @@
-iconv zlib
+iconv
 
 ----------
 All lines of this file are ignored except the first.

build/pkgs/pillow/dependencies

@@ -1,4 +1,4 @@
- zlib freetype trove_classifiers | $(PYTHON_TOOLCHAIN) $(PYTHON)
+ freetype trove_classifiers | $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.

build/pkgs/pillow/spkg-configure.m4

@@ -1,5 +1,5 @@
 SAGE_SPKG_CONFIGURE([pillow], [
-  SAGE_SPKG_DEPCHECK([freetype libpng zlib], [
+  SAGE_SPKG_DEPCHECK([freetype libpng], [
     SAGE_PYTHON_PACKAGE_CHECK([pillow])
   ])
 ])

build/pkgs/pycryptosat/dependencies

@@ -1,4 +1,4 @@
- m4ri zlib libpng | cmake boost_cropped $(PYTHON_TOOLCHAIN) $(PYTHON)
+ m4ri libpng | cmake boost_cropped $(PYTHON_TOOLCHAIN) $(PYTHON)
 
 ----------
 All lines of this file are ignored except the first.

build/pkgs/python3/SPKG.rst

@@ -14,7 +14,7 @@ You can also use ``--with-python=/path/to/python3_binary`` to tell Sage to use
 ``/path/to/python3_binary`` to set up the venv. Note that setting up the venv requires
 a number of Python modules to be available within the Python in question. Currently,
 as of Sage 10.3, these modules are as follows: ``sqlite3``, ``ctypes``, ``math``,
-``hashlib``, ``socket``, ``zlib``, ``ssl``, ``ensurepip``.
+``hashlib``, ``socket``, ``ssl``, ``ensurepip``.
 For Python >= 3.12, also ``setuptools`` is required; for older Python versions,
 ``distutils.core`` is required. These modules will be checked for by the ``configure``
 script.

build/pkgs/python3/dependencies

@@ -1,4 +1,4 @@
-zlib readline sqlite libpng liblzma libffi openssl | xz
+readline sqlite libpng liblzma libffi openssl | xz
 
 ----------
 All lines of this file are ignored except the first.

build/pkgs/python3/spkg-configure.m4

@@ -20,11 +20,11 @@ SAGE_SPKG_CONFIGURE([python3], [
    dnl
    dnl However, if we add another package (providing a shared library linked into a Python module)
    dnl that also uses libsqlite3, then we will have to put the DEPCHECK back in.
-   SAGE_SPKG_DEPCHECK([liblzma libffi zlib], [
+   SAGE_SPKG_DEPCHECK([liblzma libffi], [
       dnl Check if we can do venv with a system python3
       dnl instead of building our own copy.
       dnl  Issue #31160: We no longer check for readline here.
-      check_modules="sqlite3, ctypes, math, hashlib, socket, zlib, ssl, ensurepip"
+      check_modules="sqlite3, ctypes, math, hashlib, socket, ssl, ensurepip, zlib"
       AC_CACHE_CHECK([for python3 >= ]MIN_VERSION[, < ]LT_VERSION[ with modules $check_modules and setuptools/distutils], [ac_cv_path_PYTHON3], [
         AS_IF([test x"$ac_path_PYTHON3" != x], [dnl checking explicitly specified $with_python
            AC_MSG_RESULT([])

build/pkgs/scip/dependencies

@@ -1,4 +1,4 @@
-$(MP_LIBRARY) readline soplex papilo zlib bliss | cmake
+$(MP_LIBRARY) readline soplex papilo bliss | cmake
 
 ----------
 All lines of this file are ignored except the first.

build/pkgs/soplex/dependencies

@@ -1 +1 @@
-$(MP_LIBRARY) mpfr boost_cropped zlib papilo | cmake
+$(MP_LIBRARY) mpfr boost_cropped papilo | cmake