build/pkgs/{openblas,openssl,r}/spkg-configure.m4: Remove Cygwin supp…

…ort code
sagemath · Jan 7, 2024 · 4069e33 · 4069e33
1 parent b72ead6
commit 4069e33
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 27 deletions.
diff --git a/build/pkgs/gfortran/spkg-configure.m4 b/build/pkgs/gfortran/spkg-configure.m4
@@ -93,10 +93,4 @@ SAGE_SPKG_CONFIGURE([gfortran], [
                     ])
             ])
     fi
-    AS_CASE([$host],
-            [*-*-cygwin*], [AS_VAR_IF([sage_spkg_install_gfortran], [yes], [
-                                AS_VAR_APPEND([SAGE_SPKG_ERRORS], ["
-  On Cygwin, gfortran must be installed as a system package. This is an error."])
-                            ])
-                           ])
 ])
diff --git a/build/pkgs/openblas/spkg-configure.m4 b/build/pkgs/openblas/spkg-configure.m4
@@ -66,12 +66,7 @@ SAGE_SPKG_CONFIGURE([openblas], [
      ])
     ], [
       dnl No openblas.pc
-      AS_CASE([$host],
-        [*-*-cygwin*], [dnl #29538 - workaround failing build of matplotlib etc.
-                        AS_VAR_SET([HAVE_OPENBLAS], [no])
-                        AC_MSG_RESULT([$HAVE_OPENBLAS, test for OpenBLAS disabled on Cygwin])
-                       ],
-                       [dnl Recent OpenBLAS (>= 0.3.4, Dec 2018) provides the version number as
+                        dnl Recent OpenBLAS (>= 0.3.4, Dec 2018) provides the version number as
                         dnl part of openblas_get_config.  We reject all older versions.
                         AC_SEARCH_LIBS([openblas_get_config], [openblas cblas blas], [
                          AS_IF([test x"$ac_cv_search_openblas_get_config" != x"none required"], [
@@ -109,7 +104,6 @@ SAGE_SPKG_CONFIGURE([openblas], [
                          AC_LANG_POP([C])
                          AC_MSG_RESULT([$HAVE_OPENBLAS])
                        ])
-                      ])
       AC_SEARCH_LIBS([cblas_dgemm], [openblas cblas blas], [
         AS_VAR_SET([HAVE_CBLAS_DGEMM], [yes])
         AS_IF([test x"$ac_cv_search_cblas_dgemm" != x"none required"], [

diff --git a/build/pkgs/openssl/spkg-configure.m4 b/build/pkgs/openssl/spkg-configure.m4
@@ -48,12 +48,6 @@ SAGE_SPKG_CONFIGURE([openssl], [
   ], [dnl No openssl found
       sage_spkg_install_openssl=yes
   ])
-  AS_CASE([$host],
-          [*-*-cygwin*], [AS_VAR_IF([sage_spkg_install_openssl], [yes], [
-                              AS_VAR_APPEND([SAGE_SPKG_ERRORS], ["
-On Cygwin, openssl must be installed as a system package. This is an error."])
-                          ])
-                         ])
 ], [dnl REQUIRED-CHECK
   AC_REQUIRE([SAGE_SPKG_CONFIGURE_PYTHON3])
   AC_REQUIRE([SAGE_SPKG_CONFIGURE_CURL])

diff --git a/build/pkgs/r/spkg-configure.m4 b/build/pkgs/r/spkg-configure.m4
@@ -1,12 +1,7 @@
 SAGE_SPKG_CONFIGURE([r], [
     dnl https://rpy2.github.io/doc/v3.4.x/html/overview.html#requirements
     m4_pushdef([SAGE_R_MINVER],["3.5"])
-    AS_CASE([$host],
-        [*-*-cygwin*], [
-          dnl #29486: rpy2 2.8.x does not build against system R on cygwin.
-          sage_spkg_install_r=yes
-        ], [
-          PKG_CHECK_MODULES([R], [libR >= SAGE_R_MINVER], [
+    PKG_CHECK_MODULES([R], [libR >= SAGE_R_MINVER], [
             AC_PATH_PROG([R], [R])
               AS_IF([test "x$R" = x], [
                 AC_MSG_NOTICE([R is not found])
@@ -15,7 +10,6 @@ SAGE_SPKG_CONFIGURE([r], [
                 dnl TODO: check that versions of R and libR match
                 sage_spkg_install_r=no
                 ])
-         ], [sage_spkg_install_r=yes])
-    ])
+    ], [sage_spkg_install_r=yes])
     m4_popdef([SAGE_R_MINVER])
 ])