Skip to content

Commit

Permalink
gh-38966: Clean up Cygwin remnants
Browse files Browse the repository at this point in the history
We dropped support for Cygwin a while ago, but there is some stuff left
over in the tree. Let's finally remove it.

URL: #38966
Reported by: Michael Orlitzky
Reviewer(s): Kwankyu Lee
  • Loading branch information
Release Manager committed Nov 14, 2024
2 parents 54af5b3 + 704bad0 commit d9c38a7
Show file tree
Hide file tree
Showing 66 changed files with 10 additions and 141 deletions.
9 changes: 1 addition & 8 deletions build/bin/sage-guess-package-system
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 0 additions & 6 deletions build/bin/sage-print-system-package-command
Original file line number Diff line number Diff line change
Expand Up @@ -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
;;
Expand Down
1 change: 0 additions & 1 deletion build/bin/sage-spkg-info
Original file line number Diff line number Diff line change
Expand Up @@ -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";;
Expand Down
2 changes: 0 additions & 2 deletions build/pkgs/4ti2/distros/cygwin.txt

This file was deleted.

4 changes: 0 additions & 4 deletions build/pkgs/_bootstrap/distros/cygwin.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/_develop/distros/cygwin.txt

This file was deleted.

28 changes: 0 additions & 28 deletions build/pkgs/_prereq/distros/cygwin.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/_python3.10/distros/cygwin.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/_python3.11/distros/cygwin.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/_python3.12/distros/cygwin.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/_python3.9/distros/cygwin.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/boost_cropped/distros/cygwin.txt

This file was deleted.

2 changes: 0 additions & 2 deletions build/pkgs/bzip2/distros/cygwin.txt

This file was deleted.

2 changes: 0 additions & 2 deletions build/pkgs/cddlib/distros/cygwin.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/cmake/distros/cygwin.txt

This file was deleted.

4 changes: 2 additions & 2 deletions build/pkgs/configure/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
tarball=configure-VERSION.tar.gz
sha1=490f6d988c1c4c0786a0c8b36e708db56e17bfa6
sha256=2e2b6821c9abd7d2b910edb1237f3622e985a2321cf1eedb2161b714494c6643
sha1=b57fc7a6adb26a01f6b49cd5599221d8fb369a77
sha256=da2ce0e892f28c583f6f43238d295375db66275d9196222e3859743260296674
2 changes: 1 addition & 1 deletion build/pkgs/configure/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
93661cbe00c3e83691d6ed8c64586163cfdae62f
20ad1c640949d5999c11148295ef4f856b2e745e
2 changes: 0 additions & 2 deletions build/pkgs/curl/distros/cygwin.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/flint/distros/cygwin.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/freetype/distros/cygwin.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/gc/distros/cygwin.txt

This file was deleted.

3 changes: 0 additions & 3 deletions build/pkgs/gcc/distros/cygwin.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/gengetopt/distros/cygwin.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/gfortran/distros/cygwin.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/git/distros/cygwin.txt

This file was deleted.

2 changes: 0 additions & 2 deletions build/pkgs/glpk/distros/cygwin.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/gmp/distros/cygwin.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/graphviz/distros/cygwin.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/gsl/distros/cygwin.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/iconv/distros/cygwin.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/imagemagick/distros/cygwin.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/info/distros/cygwin.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/isl/distros/cygwin.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/libatomic_ops/distros/cygwin.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/libffi/distros/cygwin.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/libgd/distros/cygwin.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/libgraphviz/distros/cygwin.txt

This file was deleted.

2 changes: 0 additions & 2 deletions build/pkgs/liblzma/distros/cygwin.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/libxml2/distros/cygwin.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/llvm/distros/cygwin.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/maxima/distros/cygwin.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/mpc/distros/cygwin.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/mpfr/distros/cygwin.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/ncurses/distros/cygwin.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/ninja_build/distros/cygwin.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/ntl/distros/cygwin.txt

This file was deleted.

2 changes: 0 additions & 2 deletions build/pkgs/openblas/distros/cygwin.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/openssl/distros/cygwin.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/patch/distros/cygwin.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/perl_term_readline_gnu/distros/cygwin.txt

This file was deleted.

5 changes: 0 additions & 5 deletions build/pkgs/python3/distros/cygwin.txt

This file was deleted.

6 changes: 0 additions & 6 deletions build/pkgs/python3/spkg-configure.m4
Original file line number Diff line number Diff line change
Expand Up @@ -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
], [
Expand Down
1 change: 0 additions & 1 deletion build/pkgs/qhull/distros/cygwin.txt

This file was deleted.

2 changes: 0 additions & 2 deletions build/pkgs/r/distros/cygwin.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/readline/distros/cygwin.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/sbcl/distros/cygwin.txt

This file was deleted.

2 changes: 0 additions & 2 deletions build/pkgs/singular/distros/cygwin.txt

This file was deleted.

2 changes: 0 additions & 2 deletions build/pkgs/sqlite/distros/cygwin.txt

This file was deleted.

17 changes: 5 additions & 12 deletions build/pkgs/sqlite/spkg-configure.m4
Original file line number Diff line number Diff line change
Expand Up @@ -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
])
])
1 change: 0 additions & 1 deletion build/pkgs/suitesparse/distros/cygwin.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/texlive/distros/cygwin.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/texlive_luatex/distros/cygwin.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/xz/distros/cygwin.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/zeromq/distros/cygwin.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/zlib/distros/cygwin.txt

This file was deleted.

2 changes: 1 addition & 1 deletion src/doc/en/developer/portability_testing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit d9c38a7

Please sign in to comment.