CVS commit: pkgsrc/lang/python27

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Apr 21 20:51:32 UTC 2025

Modified Files:
        pkgsrc/lang/python27: Makefile distinfo platname.mk
        pkgsrc/lang/python27/patches: patch-configure

Log Message:
python27: remove Interix support


To generate a diff of this commit:
cvs rdiff -u -r1.120 -r1.121 pkgsrc/lang/python27/Makefile
cvs rdiff -u -r1.95 -r1.96 pkgsrc/lang/python27/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/python27/platname.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/python27/patches/patch-configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/python27/Makefile
diff -u pkgsrc/lang/python27/Makefile:1.120 pkgsrc/lang/python27/Makefile:1.121
--- pkgsrc/lang/python27/Makefile:1.120 Thu Apr 17 21:51:22 2025
+++ pkgsrc/lang/python27/Makefile       Mon Apr 21 20:51:32 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.120 2025/04/17 21:51:22 wiz Exp $
+# $NetBSD: Makefile,v 1.121 2025/04/21 20:51:32 wiz Exp $
 
 .include "dist.mk"
 
@@ -82,7 +82,7 @@ PY_VER_SUFFIX=                2.7
 CONFIGURE_ENV+=                ac_cv_func_bind_textdomain_codeset=yes
 .endif
 
-.if ${OPSYS} == "Cygwin" || ${OPSYS} == "Darwin" || ${OPSYS} == "Interix"
+.if ${OPSYS} == "Cygwin" || ${OPSYS} == "Darwin"
 USE_TOOLS+=    gmake
 .endif
 

Index: pkgsrc/lang/python27/distinfo
diff -u pkgsrc/lang/python27/distinfo:1.95 pkgsrc/lang/python27/distinfo:1.96
--- pkgsrc/lang/python27/distinfo:1.95  Sun Mar 30 21:10:44 2025
+++ pkgsrc/lang/python27/distinfo       Mon Apr 21 20:51:32 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.95 2025/03/30 21:10:44 wiz Exp $
+$NetBSD: distinfo,v 1.96 2025/04/21 20:51:32 wiz Exp $
 
 BLAKE2s (Python-2.7.18.tar.xz) = 1b673ec8c9362a178e044691392bc4f67ad13457d7fddd84a88de346f23f9812
 SHA512 (Python-2.7.18.tar.xz) = a7bb62b51f48ff0b6df0b18f5b0312a523e3110f49c3237936bfe56ed0e26838c0274ff5401bda6fc21bf24337477ccac49e8026c5d651e4b4cafb5eb5086f6c
@@ -60,6 +60,6 @@ SHA1 (patch-Modules_selectmodule.c) = 01
 SHA1 (patch-Modules_socketmodule.c) = 16848d90947b3de1f921a0813fa5c317f76961d4
 SHA1 (patch-Modules_sunaudiodev.c) = d836d77854a2b3d79fa34a06a8e2493bf0a503e6
 SHA1 (patch-Python_thread__pthread.h) = 517cfefc2f2e13631d22bad28c327513cdf17c10
-SHA1 (patch-configure) = 80c2c067be81690656beb5011d2dbb3211c8a891
+SHA1 (patch-configure) = f7b67286adc135f6b979f40ff84482aba5d385cc
 SHA1 (patch-pyconfig.h.in) = 66d1a685e17ef7977bf09cdc64bdf80087216bc7
 SHA1 (patch-setup.py) = 9a4007fd03be0020d7997807c7fef0c2bd21fdfd

Index: pkgsrc/lang/python27/platname.mk
diff -u pkgsrc/lang/python27/platname.mk:1.1 pkgsrc/lang/python27/platname.mk:1.2
--- pkgsrc/lang/python27/platname.mk:1.1        Tue Jun 27 10:35:29 2023
+++ pkgsrc/lang/python27/platname.mk    Mon Apr 21 20:51:32 2025
@@ -1,6 +1,6 @@
-#      $NetBSD: platname.mk,v 1.1 2023/06/27 10:35:29 riastradh Exp $
+#      $NetBSD: platname.mk,v 1.2 2025/04/21 20:51:32 wiz Exp $
 
-.if ${OPSYS} == "Cygwin" || ${OPSYS} == "Darwin" || ${OPSYS} == "Interix"
+.if ${OPSYS} == "Cygwin" || ${OPSYS} == "Darwin"
 PY_PLATNAME=   ${LOWER_OPSYS}
 .elif ${OPSYS} == "IRIX"
 PY_PLATNAME=   ${LOWER_OPSYS:C/\..*//}

Index: pkgsrc/lang/python27/patches/patch-configure
diff -u pkgsrc/lang/python27/patches/patch-configure:1.3 pkgsrc/lang/python27/patches/patch-configure:1.4
--- pkgsrc/lang/python27/patches/patch-configure:1.3    Sun Mar 30 21:10:44 2025
+++ pkgsrc/lang/python27/patches/patch-configure        Mon Apr 21 20:51:32 2025
@@ -1,13 +1,12 @@
-$NetBSD: patch-configure,v 1.3 2025/03/30 21:10:44 wiz Exp $
+$NetBSD: patch-configure,v 1.4 2025/04/21 20:51:32 wiz Exp $
 
-- recognize Interix
 - remove special-case library version hack for FreeBSD
 - don't set Mac OS X target version: stick to the current one
 - honor pkgsrc LDFLAGS
 - macOS arm64 and darwin20 support, via MacPorts
 - other stuff not previously commented (XXX)
 
---- configure.orig     2021-06-22 19:20:43.000000000 +0000
+--- configure.orig     2020-04-19 21:13:39.000000000 +0000
 +++ configure
 @@ -3407,7 +3407,7 @@ $as_echo "#define _BSD_SOURCE 1" >>confd
    # has no effect, don't bother defining them
@@ -18,12 +17,7 @@ $NetBSD: patch-configure,v 1.3 2025/03/3
      define_xopen_source=no;;
    # On AIX 4 and 5.1, mbstate_t is defined only when _XOPEN_SOURCE == 500 but
    # used in wcsnrtombs() and mbsnrtowcs() even if _XOPEN_SOURCE is not defined
-@@ -5481,15 +5481,10 @@ $as_echo "#define Py_ENABLE_SHARED 1" >>
-         RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
-         INSTSONAME="$LDLIBRARY".$SOVERSION
-           ;;
--    Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|OpenBSD*)
-+    Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|OpenBSD*|Interix*)
+@@ -5485,11 +5485,6 @@ $as_echo "#define Py_ENABLE_SHARED 1" >>
          LDLIBRARY='libpython$(VERSION).so'
          BLDLIBRARY='-L. -lpython$(VERSION)'
          RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
@@ -103,31 +97,7 @@ $NetBSD: patch-configure,v 1.3 2025/03/3
        BSD/OS*/4*)
                LDSHARED="gcc -shared"
                LDCXXSHARED="g++ -shared";;
-@@ -8736,7 +8740,8 @@ then
-                fi;;
-       Linux*|GNU*) CCSHARED="-fPIC";;
-       BSD/OS*/4*) CCSHARED="-fpic";;
--      FreeBSD*|NetBSD*|OpenBSD*|DragonFly*) CCSHARED="-fPIC";;
-+      FreeBSD*|NetBSD*|OpenBSD*|DragonFly*) CCSHARED="-fPIC";;
-+      Interix*) CCSHARED="";;
-       OpenUNIX*|UnixWare*)
-               if test "$GCC" = "yes"
-               then CCSHARED="-fPIC"
-@@ -8788,11 +8793,12 @@ then
-       OpenUNIX*|UnixWare*) LINKFORSHARED="-Wl,-Bexport";;
-       SCO_SV*) LINKFORSHARED="-Wl,-Bexport";;
-       ReliantUNIX*) LINKFORSHARED="-W1 -Blargedynsym";;
--      FreeBSD*|NetBSD*|OpenBSD*|DragonFly*)
-+      FreeBSD*|NetBSD*|OpenBSD*|DragonFly*)
-               if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]
-               then
-                       LINKFORSHARED="-Wl,--export-dynamic"
-               fi;;
-+      Interix*) LINKFORSHARED="-Wl,-E";;
-       SunOS/5*) case $CC in
-                 *gcc*)
-                   if $CC -Xlinker --help 2>&1 | grep export-dynamic >/dev/null
-@@ -10596,6 +10602,15 @@ fi
+@@ -10596,6 +10597,15 @@ fi
  done
  
  
@@ -143,7 +113,7 @@ $NetBSD: patch-configure,v 1.3 2025/03/3
  # DYNLOADFILE specifies which dynload_*.o file we will use for dynamic
  # loading of modules.
  
-@@ -10883,6 +10898,10 @@ int
+@@ -10883,6 +10893,10 @@ int
  main ()
  {
  int x=kqueue()