From a0346c913fb5ba196bcbeae1a253f03b994e04ec Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Wed, 13 Nov 2024 17:14:35 -0500 Subject: [PATCH 1/7] build/bin/sage-guess-package-system: drop cygwin case --- build/bin/sage-guess-package-system | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/build/bin/sage-guess-package-system b/build/bin/sage-guess-package-system index 8e679c2eac9..33a7e2ad587 100755 --- a/build/bin/sage-guess-package-system +++ b/build/bin/sage-guess-package-system @@ -32,12 +32,5 @@ elif xbps-install --version > /dev/null 2>&1; then elif pkg -v > /dev/null 2>&1; then echo freebsd else - case `uname -s` in - CYGWIN*) - echo cygwin - ;; - *) - echo unknown - ;; - esac + echo unknown fi From 92300f8afb2d8cb8ff41620caadc1ed7cb25e744 Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Wed, 13 Nov 2024 17:15:12 -0500 Subject: [PATCH 2/7] build/bin/sage-print-system-package-command: drop cygwin cases --- build/bin/sage-print-system-package-command | 6 ------ 1 file changed, 6 deletions(-) diff --git a/build/bin/sage-print-system-package-command b/build/bin/sage-print-system-package-command index daf61c48c09..5af7740e229 100755 --- a/build/bin/sage-print-system-package-command +++ b/build/bin/sage-print-system-package-command @@ -182,12 +182,6 @@ case $system:$command in slackware*:install) [ -n "$system_packages" ] && print_shell_command ${SUDO}slackpkg install $system_packages ;; - cygwin*:update) - print_comment "first install apt-cyg from https://github.com/transcode-open/apt-cyg" - ;; - cygwin*:install) - [ -n "$system_packages" ] && print_shell_command apt-cyg install $system_packages - ;; freebsd*:install) [ -n "$system_packages" ] && print_shell_command ${SUDO}pkg install $system_packages ;; From 4c3ea02d4fab2601313023d3dec1551a5a200d4e Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Wed, 13 Nov 2024 17:15:56 -0500 Subject: [PATCH 3/7] build/bin/sage-spkg-info: drop cygwin case --- build/bin/sage-spkg-info | 1 - 1 file changed, 1 deletion(-) diff --git a/build/bin/sage-spkg-info b/build/bin/sage-spkg-info index 29d833a29bf..09b4ea8c1be 100755 --- a/build/bin/sage-spkg-info +++ b/build/bin/sage-spkg-info @@ -85,7 +85,6 @@ for system in $systems; do alpine) tab "Alpine";; arch) tab "Arch Linux";; conda) tab "conda-forge";; - cygwin) tab "Cygwin";; debian) tab "Debian/Ubuntu";; fedora) tab "Fedora/Redhat/CentOS";; freebsd) tab "FreeBSD";; From 8d96a6a4f57c5f526ceb05a3f57568d237fbd1cd Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Wed, 13 Nov 2024 17:16:55 -0500 Subject: [PATCH 4/7] build/pkgs: delete all cygwin.txt files --- build/pkgs/4ti2/distros/cygwin.txt | 2 -- build/pkgs/_bootstrap/distros/cygwin.txt | 4 --- build/pkgs/_develop/distros/cygwin.txt | 1 - build/pkgs/_prereq/distros/cygwin.txt | 28 ------------------- build/pkgs/_python3.10/distros/cygwin.txt | 1 - build/pkgs/_python3.11/distros/cygwin.txt | 1 - build/pkgs/_python3.12/distros/cygwin.txt | 1 - build/pkgs/_python3.9/distros/cygwin.txt | 1 - build/pkgs/boost_cropped/distros/cygwin.txt | 1 - build/pkgs/bzip2/distros/cygwin.txt | 2 -- build/pkgs/cddlib/distros/cygwin.txt | 2 -- build/pkgs/cmake/distros/cygwin.txt | 1 - build/pkgs/curl/distros/cygwin.txt | 2 -- build/pkgs/flint/distros/cygwin.txt | 1 - build/pkgs/freetype/distros/cygwin.txt | 1 - build/pkgs/gc/distros/cygwin.txt | 1 - build/pkgs/gcc/distros/cygwin.txt | 3 -- build/pkgs/gengetopt/distros/cygwin.txt | 1 - build/pkgs/gfortran/distros/cygwin.txt | 1 - build/pkgs/git/distros/cygwin.txt | 1 - build/pkgs/glpk/distros/cygwin.txt | 2 -- build/pkgs/gmp/distros/cygwin.txt | 1 - build/pkgs/graphviz/distros/cygwin.txt | 1 - build/pkgs/gsl/distros/cygwin.txt | 1 - build/pkgs/iconv/distros/cygwin.txt | 1 - build/pkgs/imagemagick/distros/cygwin.txt | 1 - build/pkgs/info/distros/cygwin.txt | 1 - build/pkgs/isl/distros/cygwin.txt | 1 - build/pkgs/libatomic_ops/distros/cygwin.txt | 1 - build/pkgs/libffi/distros/cygwin.txt | 1 - build/pkgs/libgd/distros/cygwin.txt | 1 - build/pkgs/libgraphviz/distros/cygwin.txt | 1 - build/pkgs/liblzma/distros/cygwin.txt | 2 -- build/pkgs/libxml2/distros/cygwin.txt | 1 - build/pkgs/llvm/distros/cygwin.txt | 1 - build/pkgs/maxima/distros/cygwin.txt | 1 - build/pkgs/mpc/distros/cygwin.txt | 1 - build/pkgs/mpfr/distros/cygwin.txt | 1 - build/pkgs/ncurses/distros/cygwin.txt | 1 - build/pkgs/ninja_build/distros/cygwin.txt | 1 - build/pkgs/ntl/distros/cygwin.txt | 1 - build/pkgs/openblas/distros/cygwin.txt | 2 -- build/pkgs/openssl/distros/cygwin.txt | 1 - build/pkgs/patch/distros/cygwin.txt | 1 - .../perl_term_readline_gnu/distros/cygwin.txt | 1 - build/pkgs/python3/distros/cygwin.txt | 5 ---- build/pkgs/qhull/distros/cygwin.txt | 1 - build/pkgs/r/distros/cygwin.txt | 2 -- build/pkgs/readline/distros/cygwin.txt | 1 - build/pkgs/sbcl/distros/cygwin.txt | 1 - build/pkgs/singular/distros/cygwin.txt | 2 -- build/pkgs/sqlite/distros/cygwin.txt | 2 -- build/pkgs/suitesparse/distros/cygwin.txt | 1 - build/pkgs/texlive/distros/cygwin.txt | 1 - build/pkgs/texlive_luatex/distros/cygwin.txt | 1 - build/pkgs/xz/distros/cygwin.txt | 1 - build/pkgs/zeromq/distros/cygwin.txt | 1 - build/pkgs/zlib/distros/cygwin.txt | 1 - 58 files changed, 104 deletions(-) delete mode 100644 build/pkgs/4ti2/distros/cygwin.txt delete mode 100644 build/pkgs/_bootstrap/distros/cygwin.txt delete mode 100644 build/pkgs/_develop/distros/cygwin.txt delete mode 100644 build/pkgs/_prereq/distros/cygwin.txt delete mode 100644 build/pkgs/_python3.10/distros/cygwin.txt delete mode 100644 build/pkgs/_python3.11/distros/cygwin.txt delete mode 100644 build/pkgs/_python3.12/distros/cygwin.txt delete mode 100644 build/pkgs/_python3.9/distros/cygwin.txt delete mode 100644 build/pkgs/boost_cropped/distros/cygwin.txt delete mode 100644 build/pkgs/bzip2/distros/cygwin.txt delete mode 100644 build/pkgs/cddlib/distros/cygwin.txt delete mode 100644 build/pkgs/cmake/distros/cygwin.txt delete mode 100644 build/pkgs/curl/distros/cygwin.txt delete mode 100644 build/pkgs/flint/distros/cygwin.txt delete mode 100644 build/pkgs/freetype/distros/cygwin.txt delete mode 100644 build/pkgs/gc/distros/cygwin.txt delete mode 100644 build/pkgs/gcc/distros/cygwin.txt delete mode 100644 build/pkgs/gengetopt/distros/cygwin.txt delete mode 100644 build/pkgs/gfortran/distros/cygwin.txt delete mode 100644 build/pkgs/git/distros/cygwin.txt delete mode 100644 build/pkgs/glpk/distros/cygwin.txt delete mode 100644 build/pkgs/gmp/distros/cygwin.txt delete mode 100644 build/pkgs/graphviz/distros/cygwin.txt delete mode 100644 build/pkgs/gsl/distros/cygwin.txt delete mode 100644 build/pkgs/iconv/distros/cygwin.txt delete mode 100644 build/pkgs/imagemagick/distros/cygwin.txt delete mode 100644 build/pkgs/info/distros/cygwin.txt delete mode 100644 build/pkgs/isl/distros/cygwin.txt delete mode 100644 build/pkgs/libatomic_ops/distros/cygwin.txt delete mode 100644 build/pkgs/libffi/distros/cygwin.txt delete mode 100644 build/pkgs/libgd/distros/cygwin.txt delete mode 100644 build/pkgs/libgraphviz/distros/cygwin.txt delete mode 100644 build/pkgs/liblzma/distros/cygwin.txt delete mode 100644 build/pkgs/libxml2/distros/cygwin.txt delete mode 100644 build/pkgs/llvm/distros/cygwin.txt delete mode 100644 build/pkgs/maxima/distros/cygwin.txt delete mode 100644 build/pkgs/mpc/distros/cygwin.txt delete mode 100644 build/pkgs/mpfr/distros/cygwin.txt delete mode 100644 build/pkgs/ncurses/distros/cygwin.txt delete mode 100644 build/pkgs/ninja_build/distros/cygwin.txt delete mode 100644 build/pkgs/ntl/distros/cygwin.txt delete mode 100644 build/pkgs/openblas/distros/cygwin.txt delete mode 100644 build/pkgs/openssl/distros/cygwin.txt delete mode 100644 build/pkgs/patch/distros/cygwin.txt delete mode 100644 build/pkgs/perl_term_readline_gnu/distros/cygwin.txt delete mode 100644 build/pkgs/python3/distros/cygwin.txt delete mode 100644 build/pkgs/qhull/distros/cygwin.txt delete mode 100644 build/pkgs/r/distros/cygwin.txt delete mode 100644 build/pkgs/readline/distros/cygwin.txt delete mode 100644 build/pkgs/sbcl/distros/cygwin.txt delete mode 100644 build/pkgs/singular/distros/cygwin.txt delete mode 100644 build/pkgs/sqlite/distros/cygwin.txt delete mode 100644 build/pkgs/suitesparse/distros/cygwin.txt delete mode 100644 build/pkgs/texlive/distros/cygwin.txt delete mode 100644 build/pkgs/texlive_luatex/distros/cygwin.txt delete mode 100644 build/pkgs/xz/distros/cygwin.txt delete mode 100644 build/pkgs/zeromq/distros/cygwin.txt delete mode 100644 build/pkgs/zlib/distros/cygwin.txt diff --git a/build/pkgs/4ti2/distros/cygwin.txt b/build/pkgs/4ti2/distros/cygwin.txt deleted file mode 100644 index fab3a09f46e..00000000000 --- a/build/pkgs/4ti2/distros/cygwin.txt +++ /dev/null @@ -1,2 +0,0 @@ -lib4ti2_0 -lib4ti2-devel diff --git a/build/pkgs/_bootstrap/distros/cygwin.txt b/build/pkgs/_bootstrap/distros/cygwin.txt deleted file mode 100644 index bde788ee5d9..00000000000 --- a/build/pkgs/_bootstrap/distros/cygwin.txt +++ /dev/null @@ -1,4 +0,0 @@ -# Packages needed for ./bootstrap -autoconf -automake -libtool diff --git a/build/pkgs/_develop/distros/cygwin.txt b/build/pkgs/_develop/distros/cygwin.txt deleted file mode 100644 index 239772ed91d..00000000000 --- a/build/pkgs/_develop/distros/cygwin.txt +++ /dev/null @@ -1 +0,0 @@ -gnupg2 diff --git a/build/pkgs/_prereq/distros/cygwin.txt b/build/pkgs/_prereq/distros/cygwin.txt deleted file mode 100644 index 7a05e1aaa54..00000000000 --- a/build/pkgs/_prereq/distros/cygwin.txt +++ /dev/null @@ -1,28 +0,0 @@ -# This file, build/pkgs/_prereq/distros/cygwin.txt, contains names of -# Cygwin packages needed for installation of Sage from source. -# -# In addition, the files build/pkgs/SPKG/distros/cygwin.txt contain -# the names of packages that provide the equivalent of SPKG. -# -# One package per line. No need to escape special characters. -# Everything on a line after a # character is ignored. -# -binutils -make -m4 -# a system python is needed for downloading the sage packages, https://github.com/sagemath/sage/issues/29090 -python39-urllib3 -python39 -perl -perl-ExtUtils-MakeMaker -tar -gcc-core -gcc-g++ -# Needed according to embray at https://github.com/sagemath/sage/issues/26964: -# The need for which comes [...] from MPIR's configure script -findutils -which -# For python3 build -libcrypt-devel -# For R build -libiconv-devel diff --git a/build/pkgs/_python3.10/distros/cygwin.txt b/build/pkgs/_python3.10/distros/cygwin.txt deleted file mode 100644 index 92826c681b4..00000000000 --- a/build/pkgs/_python3.10/distros/cygwin.txt +++ /dev/null @@ -1 +0,0 @@ -python310 diff --git a/build/pkgs/_python3.11/distros/cygwin.txt b/build/pkgs/_python3.11/distros/cygwin.txt deleted file mode 100644 index 1d66f45569a..00000000000 --- a/build/pkgs/_python3.11/distros/cygwin.txt +++ /dev/null @@ -1 +0,0 @@ -python311 diff --git a/build/pkgs/_python3.12/distros/cygwin.txt b/build/pkgs/_python3.12/distros/cygwin.txt deleted file mode 100644 index a1bf1c64c82..00000000000 --- a/build/pkgs/_python3.12/distros/cygwin.txt +++ /dev/null @@ -1 +0,0 @@ -python312 diff --git a/build/pkgs/_python3.9/distros/cygwin.txt b/build/pkgs/_python3.9/distros/cygwin.txt deleted file mode 100644 index 6a2d05c5edb..00000000000 --- a/build/pkgs/_python3.9/distros/cygwin.txt +++ /dev/null @@ -1 +0,0 @@ -python39 diff --git a/build/pkgs/boost_cropped/distros/cygwin.txt b/build/pkgs/boost_cropped/distros/cygwin.txt deleted file mode 100644 index 444ab77a410..00000000000 --- a/build/pkgs/boost_cropped/distros/cygwin.txt +++ /dev/null @@ -1 +0,0 @@ -libboost-devel diff --git a/build/pkgs/bzip2/distros/cygwin.txt b/build/pkgs/bzip2/distros/cygwin.txt deleted file mode 100644 index 8ef7f4d0734..00000000000 --- a/build/pkgs/bzip2/distros/cygwin.txt +++ /dev/null @@ -1,2 +0,0 @@ -bzip2 -libbz2-devel diff --git a/build/pkgs/cddlib/distros/cygwin.txt b/build/pkgs/cddlib/distros/cygwin.txt deleted file mode 100644 index d406d903210..00000000000 --- a/build/pkgs/cddlib/distros/cygwin.txt +++ /dev/null @@ -1,2 +0,0 @@ -cddlib-devel -cddlib-tools diff --git a/build/pkgs/cmake/distros/cygwin.txt b/build/pkgs/cmake/distros/cygwin.txt deleted file mode 100644 index a3ea3e4380f..00000000000 --- a/build/pkgs/cmake/distros/cygwin.txt +++ /dev/null @@ -1 +0,0 @@ -cmake diff --git a/build/pkgs/curl/distros/cygwin.txt b/build/pkgs/curl/distros/cygwin.txt deleted file mode 100644 index 26bfd4d1186..00000000000 --- a/build/pkgs/curl/distros/cygwin.txt +++ /dev/null @@ -1,2 +0,0 @@ -libcurl-devel -curl diff --git a/build/pkgs/flint/distros/cygwin.txt b/build/pkgs/flint/distros/cygwin.txt deleted file mode 100644 index cf5b84dbc05..00000000000 --- a/build/pkgs/flint/distros/cygwin.txt +++ /dev/null @@ -1 +0,0 @@ -libflint-devel diff --git a/build/pkgs/freetype/distros/cygwin.txt b/build/pkgs/freetype/distros/cygwin.txt deleted file mode 100644 index efdffca75b2..00000000000 --- a/build/pkgs/freetype/distros/cygwin.txt +++ /dev/null @@ -1 +0,0 @@ -libfreetype-devel diff --git a/build/pkgs/gc/distros/cygwin.txt b/build/pkgs/gc/distros/cygwin.txt deleted file mode 100644 index 3d9787221be..00000000000 --- a/build/pkgs/gc/distros/cygwin.txt +++ /dev/null @@ -1 +0,0 @@ -libgc-devel diff --git a/build/pkgs/gcc/distros/cygwin.txt b/build/pkgs/gcc/distros/cygwin.txt deleted file mode 100644 index dde4bb418b6..00000000000 --- a/build/pkgs/gcc/distros/cygwin.txt +++ /dev/null @@ -1,3 +0,0 @@ -gcc-core -gcc-g++ -gcc-fortran diff --git a/build/pkgs/gengetopt/distros/cygwin.txt b/build/pkgs/gengetopt/distros/cygwin.txt deleted file mode 100644 index 2865264cd70..00000000000 --- a/build/pkgs/gengetopt/distros/cygwin.txt +++ /dev/null @@ -1 +0,0 @@ -gengetopt diff --git a/build/pkgs/gfortran/distros/cygwin.txt b/build/pkgs/gfortran/distros/cygwin.txt deleted file mode 100644 index 8f962328b1e..00000000000 --- a/build/pkgs/gfortran/distros/cygwin.txt +++ /dev/null @@ -1 +0,0 @@ -gcc-fortran diff --git a/build/pkgs/git/distros/cygwin.txt b/build/pkgs/git/distros/cygwin.txt deleted file mode 100644 index 5664e303b5d..00000000000 --- a/build/pkgs/git/distros/cygwin.txt +++ /dev/null @@ -1 +0,0 @@ -git diff --git a/build/pkgs/glpk/distros/cygwin.txt b/build/pkgs/glpk/distros/cygwin.txt deleted file mode 100644 index 0fbb959079e..00000000000 --- a/build/pkgs/glpk/distros/cygwin.txt +++ /dev/null @@ -1,2 +0,0 @@ -glpk -libglpk-devel diff --git a/build/pkgs/gmp/distros/cygwin.txt b/build/pkgs/gmp/distros/cygwin.txt deleted file mode 100644 index bde3aa97bd3..00000000000 --- a/build/pkgs/gmp/distros/cygwin.txt +++ /dev/null @@ -1 +0,0 @@ -libgmp-devel diff --git a/build/pkgs/graphviz/distros/cygwin.txt b/build/pkgs/graphviz/distros/cygwin.txt deleted file mode 100644 index 4d95609306f..00000000000 --- a/build/pkgs/graphviz/distros/cygwin.txt +++ /dev/null @@ -1 +0,0 @@ -graphviz diff --git a/build/pkgs/gsl/distros/cygwin.txt b/build/pkgs/gsl/distros/cygwin.txt deleted file mode 100644 index 3f55673dfe6..00000000000 --- a/build/pkgs/gsl/distros/cygwin.txt +++ /dev/null @@ -1 +0,0 @@ -libgsl-devel diff --git a/build/pkgs/iconv/distros/cygwin.txt b/build/pkgs/iconv/distros/cygwin.txt deleted file mode 100644 index df78e31976a..00000000000 --- a/build/pkgs/iconv/distros/cygwin.txt +++ /dev/null @@ -1 +0,0 @@ -libiconv-devel diff --git a/build/pkgs/imagemagick/distros/cygwin.txt b/build/pkgs/imagemagick/distros/cygwin.txt deleted file mode 100644 index 7a33d03ff73..00000000000 --- a/build/pkgs/imagemagick/distros/cygwin.txt +++ /dev/null @@ -1 +0,0 @@ -ImageMagick diff --git a/build/pkgs/info/distros/cygwin.txt b/build/pkgs/info/distros/cygwin.txt deleted file mode 100644 index 55021245387..00000000000 --- a/build/pkgs/info/distros/cygwin.txt +++ /dev/null @@ -1 +0,0 @@ -info diff --git a/build/pkgs/isl/distros/cygwin.txt b/build/pkgs/isl/distros/cygwin.txt deleted file mode 100644 index a922268ab95..00000000000 --- a/build/pkgs/isl/distros/cygwin.txt +++ /dev/null @@ -1 +0,0 @@ -libisl-devel diff --git a/build/pkgs/libatomic_ops/distros/cygwin.txt b/build/pkgs/libatomic_ops/distros/cygwin.txt deleted file mode 100644 index 56dbd90c363..00000000000 --- a/build/pkgs/libatomic_ops/distros/cygwin.txt +++ /dev/null @@ -1 +0,0 @@ -libatomic_ops-devel diff --git a/build/pkgs/libffi/distros/cygwin.txt b/build/pkgs/libffi/distros/cygwin.txt deleted file mode 100644 index 31d794ff28d..00000000000 --- a/build/pkgs/libffi/distros/cygwin.txt +++ /dev/null @@ -1 +0,0 @@ -libffi-devel diff --git a/build/pkgs/libgd/distros/cygwin.txt b/build/pkgs/libgd/distros/cygwin.txt deleted file mode 100644 index 3094bd88c2e..00000000000 --- a/build/pkgs/libgd/distros/cygwin.txt +++ /dev/null @@ -1 +0,0 @@ -libgd-devel diff --git a/build/pkgs/libgraphviz/distros/cygwin.txt b/build/pkgs/libgraphviz/distros/cygwin.txt deleted file mode 100644 index 4d95609306f..00000000000 --- a/build/pkgs/libgraphviz/distros/cygwin.txt +++ /dev/null @@ -1 +0,0 @@ -graphviz diff --git a/build/pkgs/liblzma/distros/cygwin.txt b/build/pkgs/liblzma/distros/cygwin.txt deleted file mode 100644 index c5fa156f8a0..00000000000 --- a/build/pkgs/liblzma/distros/cygwin.txt +++ /dev/null @@ -1,2 +0,0 @@ -xz -liblzma-devel diff --git a/build/pkgs/libxml2/distros/cygwin.txt b/build/pkgs/libxml2/distros/cygwin.txt deleted file mode 100644 index 313ee711738..00000000000 --- a/build/pkgs/libxml2/distros/cygwin.txt +++ /dev/null @@ -1 +0,0 @@ -libxml2-devel diff --git a/build/pkgs/llvm/distros/cygwin.txt b/build/pkgs/llvm/distros/cygwin.txt deleted file mode 100644 index e671fa21003..00000000000 --- a/build/pkgs/llvm/distros/cygwin.txt +++ /dev/null @@ -1 +0,0 @@ -clang diff --git a/build/pkgs/maxima/distros/cygwin.txt b/build/pkgs/maxima/distros/cygwin.txt deleted file mode 100644 index f5fe3fdc6cb..00000000000 --- a/build/pkgs/maxima/distros/cygwin.txt +++ /dev/null @@ -1 +0,0 @@ -maxima diff --git a/build/pkgs/mpc/distros/cygwin.txt b/build/pkgs/mpc/distros/cygwin.txt deleted file mode 100644 index 279a55fdb8b..00000000000 --- a/build/pkgs/mpc/distros/cygwin.txt +++ /dev/null @@ -1 +0,0 @@ -libmpc-devel diff --git a/build/pkgs/mpfr/distros/cygwin.txt b/build/pkgs/mpfr/distros/cygwin.txt deleted file mode 100644 index e02bb1bdbb1..00000000000 --- a/build/pkgs/mpfr/distros/cygwin.txt +++ /dev/null @@ -1 +0,0 @@ -libmpfr-devel diff --git a/build/pkgs/ncurses/distros/cygwin.txt b/build/pkgs/ncurses/distros/cygwin.txt deleted file mode 100644 index d29f30ce45b..00000000000 --- a/build/pkgs/ncurses/distros/cygwin.txt +++ /dev/null @@ -1 +0,0 @@ -libncurses-devel diff --git a/build/pkgs/ninja_build/distros/cygwin.txt b/build/pkgs/ninja_build/distros/cygwin.txt deleted file mode 100644 index 63730036fd3..00000000000 --- a/build/pkgs/ninja_build/distros/cygwin.txt +++ /dev/null @@ -1 +0,0 @@ -ninja diff --git a/build/pkgs/ntl/distros/cygwin.txt b/build/pkgs/ntl/distros/cygwin.txt deleted file mode 100644 index fe822a6c887..00000000000 --- a/build/pkgs/ntl/distros/cygwin.txt +++ /dev/null @@ -1 +0,0 @@ -libntl-devel diff --git a/build/pkgs/openblas/distros/cygwin.txt b/build/pkgs/openblas/distros/cygwin.txt deleted file mode 100644 index 055fa2733d1..00000000000 --- a/build/pkgs/openblas/distros/cygwin.txt +++ /dev/null @@ -1,2 +0,0 @@ -liblapack-devel -libopenblas diff --git a/build/pkgs/openssl/distros/cygwin.txt b/build/pkgs/openssl/distros/cygwin.txt deleted file mode 100644 index 77c51ef8194..00000000000 --- a/build/pkgs/openssl/distros/cygwin.txt +++ /dev/null @@ -1 +0,0 @@ -libssl-devel diff --git a/build/pkgs/patch/distros/cygwin.txt b/build/pkgs/patch/distros/cygwin.txt deleted file mode 100644 index 9eb7b90ed50..00000000000 --- a/build/pkgs/patch/distros/cygwin.txt +++ /dev/null @@ -1 +0,0 @@ -patch diff --git a/build/pkgs/perl_term_readline_gnu/distros/cygwin.txt b/build/pkgs/perl_term_readline_gnu/distros/cygwin.txt deleted file mode 100644 index 3b6a90263dd..00000000000 --- a/build/pkgs/perl_term_readline_gnu/distros/cygwin.txt +++ /dev/null @@ -1 +0,0 @@ -perl-Term-ReadLine-Gnu diff --git a/build/pkgs/python3/distros/cygwin.txt b/build/pkgs/python3/distros/cygwin.txt deleted file mode 100644 index 8e0df5adb0d..00000000000 --- a/build/pkgs/python3/distros/cygwin.txt +++ /dev/null @@ -1,5 +0,0 @@ -# as of #27824, we use python3 for venv as well -python39-devel -# #34088 - make ensurepip work -python-pip-wheel -python-setuptools-wheel diff --git a/build/pkgs/qhull/distros/cygwin.txt b/build/pkgs/qhull/distros/cygwin.txt deleted file mode 100644 index 95d316779cf..00000000000 --- a/build/pkgs/qhull/distros/cygwin.txt +++ /dev/null @@ -1 +0,0 @@ -qhull diff --git a/build/pkgs/r/distros/cygwin.txt b/build/pkgs/r/distros/cygwin.txt deleted file mode 100644 index f532411f70a..00000000000 --- a/build/pkgs/r/distros/cygwin.txt +++ /dev/null @@ -1,2 +0,0 @@ -R -libtirpc-devel # needed for building extensions diff --git a/build/pkgs/readline/distros/cygwin.txt b/build/pkgs/readline/distros/cygwin.txt deleted file mode 100644 index 1698f0e86b8..00000000000 --- a/build/pkgs/readline/distros/cygwin.txt +++ /dev/null @@ -1 +0,0 @@ -libreadline-devel diff --git a/build/pkgs/sbcl/distros/cygwin.txt b/build/pkgs/sbcl/distros/cygwin.txt deleted file mode 100644 index 0e94cb07231..00000000000 --- a/build/pkgs/sbcl/distros/cygwin.txt +++ /dev/null @@ -1 +0,0 @@ -sbcl diff --git a/build/pkgs/singular/distros/cygwin.txt b/build/pkgs/singular/distros/cygwin.txt deleted file mode 100644 index 774625930f9..00000000000 --- a/build/pkgs/singular/distros/cygwin.txt +++ /dev/null @@ -1,2 +0,0 @@ -singular-devel -singular diff --git a/build/pkgs/sqlite/distros/cygwin.txt b/build/pkgs/sqlite/distros/cygwin.txt deleted file mode 100644 index ef624919561..00000000000 --- a/build/pkgs/sqlite/distros/cygwin.txt +++ /dev/null @@ -1,2 +0,0 @@ -libsqlite3-devel -sqlite3 diff --git a/build/pkgs/suitesparse/distros/cygwin.txt b/build/pkgs/suitesparse/distros/cygwin.txt deleted file mode 100644 index fe7b2c3f23c..00000000000 --- a/build/pkgs/suitesparse/distros/cygwin.txt +++ /dev/null @@ -1 +0,0 @@ -libsuitesparseconfig-devel diff --git a/build/pkgs/texlive/distros/cygwin.txt b/build/pkgs/texlive/distros/cygwin.txt deleted file mode 100644 index ba0ee3a029f..00000000000 --- a/build/pkgs/texlive/distros/cygwin.txt +++ /dev/null @@ -1 +0,0 @@ -texlive diff --git a/build/pkgs/texlive_luatex/distros/cygwin.txt b/build/pkgs/texlive_luatex/distros/cygwin.txt deleted file mode 100644 index ba0ee3a029f..00000000000 --- a/build/pkgs/texlive_luatex/distros/cygwin.txt +++ /dev/null @@ -1 +0,0 @@ -texlive diff --git a/build/pkgs/xz/distros/cygwin.txt b/build/pkgs/xz/distros/cygwin.txt deleted file mode 100644 index d66e95ca507..00000000000 --- a/build/pkgs/xz/distros/cygwin.txt +++ /dev/null @@ -1 +0,0 @@ -xz diff --git a/build/pkgs/zeromq/distros/cygwin.txt b/build/pkgs/zeromq/distros/cygwin.txt deleted file mode 100644 index 57737d06afb..00000000000 --- a/build/pkgs/zeromq/distros/cygwin.txt +++ /dev/null @@ -1 +0,0 @@ -libzmq-devel diff --git a/build/pkgs/zlib/distros/cygwin.txt b/build/pkgs/zlib/distros/cygwin.txt deleted file mode 100644 index f47c16b504b..00000000000 --- a/build/pkgs/zlib/distros/cygwin.txt +++ /dev/null @@ -1 +0,0 @@ -zlib-devel From bcf4fc997be3f5ca640f2aa26b5b93340de29c09 Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Wed, 13 Nov 2024 17:17:54 -0500 Subject: [PATCH 5/7] src/doc/en/developer/portability_testing.rst: don't mention cygwin.txt --- src/doc/en/developer/portability_testing.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/doc/en/developer/portability_testing.rst b/src/doc/en/developer/portability_testing.rst index 55cefd0bf60..0f8d9e4b30f 100644 --- a/src/doc/en/developer/portability_testing.rst +++ b/src/doc/en/developer/portability_testing.rst @@ -259,7 +259,7 @@ This information comes from Sage's database of equivalent system packages. For example:: $ ls build/pkgs/flint/distros/ - alpine.txt cygwin.txt fedora.txt gentoo.txt macports.txt opensuse.txt void.txt + alpine.txt fedora.txt gentoo.txt macports.txt opensuse.txt void.txt conda.txt debian.txt freebsd.txt homebrew.txt nix.txt repology.txt $ cat build/pkgs/flint/distros/debian.txt libflint-dev From db1b0befe6d4fbcfdf37b932e414cae765909b3d Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Wed, 13 Nov 2024 17:20:53 -0500 Subject: [PATCH 6/7] build/pkgs/sqlite/spkg-configure.m4: drop cygwin case --- build/pkgs/sqlite/spkg-configure.m4 | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/build/pkgs/sqlite/spkg-configure.m4 b/build/pkgs/sqlite/spkg-configure.m4 index 901e27f19e3..5fe929ea03b 100644 --- a/build/pkgs/sqlite/spkg-configure.m4 +++ b/build/pkgs/sqlite/spkg-configure.m4 @@ -33,15 +33,8 @@ SAGE_SPKG_CONFIGURE([sqlite], [ m4_popdef([SAGE_SQLITE3_MIN_VERSION_MICRO]) m4_popdef([SAGE_SQLITE3_MIN_VERSION]) ], [dnl REQUIRED-CHECK - AS_CASE([$host], - [*-*-cygwin*], [ - dnl sqlite SetDllDirectory in sage_ostools.pyx - sage_require_sqlite=yes - ], [ - AC_REQUIRE([SAGE_SPKG_CONFIGURE_PYTHON3]) - AS_IF([test x$sage_spkg_install_python3 = xno], [ - sage_require_sqlite=no - ]) - ]) -] -) + AC_REQUIRE([SAGE_SPKG_CONFIGURE_PYTHON3]) + AS_IF([test x$sage_spkg_install_python3 = xno], [ + sage_require_sqlite=no + ]) +]) From 704bad02a1165f65b43a584518a0aaf44e462608 Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Wed, 13 Nov 2024 17:22:02 -0500 Subject: [PATCH 7/7] build/pkgs/python3/spkg-configure.m4: delete cygwin case --- build/pkgs/python3/spkg-configure.m4 | 6 ------ 1 file changed, 6 deletions(-) diff --git a/build/pkgs/python3/spkg-configure.m4 b/build/pkgs/python3/spkg-configure.m4 index a51e2394e51..c6938ea7080 100644 --- a/build/pkgs/python3/spkg-configure.m4 +++ b/build/pkgs/python3/spkg-configure.m4 @@ -70,12 +70,6 @@ SAGE_SPKG_CONFIGURE([python3], [ sage_spkg_install_python3=yes ]) ]) - AS_CASE([$host], - [*-*-cygwin*], [AS_VAR_IF([sage_spkg_install_python3], [yes], [ - AS_VAR_APPEND([SAGE_SPKG_ERRORS], [" - On Cygwin, python3 must be installed as a system package. This is an error."]) - ]) - ]) ],, [ dnl PRE ], [