CVS commit: pkgsrc/lang

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/lang
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Tue, 23 Jan 2024 06:51:45 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue Jan 23 06:51:45 UTC 2024

Modified Files:
        pkgsrc/lang/python310: Makefile distinfo
        pkgsrc/lang/python310/patches: patch-setup.py
        pkgsrc/lang/python39: Makefile distinfo
        pkgsrc/lang/python39/patches: patch-setup.py

Log Message:
python39 python310: fix build on Darwin


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 pkgsrc/lang/python310/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/lang/python310/distinfo
cvs rdiff -u -r1.8 -r1.9 pkgsrc/lang/python310/patches/patch-setup.py
cvs rdiff -u -r1.34 -r1.35 pkgsrc/lang/python39/Makefile
cvs rdiff -u -r1.38 -r1.39 pkgsrc/lang/python39/distinfo
cvs rdiff -u -r1.11 -r1.12 pkgsrc/lang/python39/patches/patch-setup.py

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

Modified files:

Index: pkgsrc/lang/python310/Makefile
diff -u pkgsrc/lang/python310/Makefile:1.30 pkgsrc/lang/python310/Makefile:1.31
--- pkgsrc/lang/python310/Makefile:1.30 Sat Jan 13 04:24:28 2024
+++ pkgsrc/lang/python310/Makefile      Tue Jan 23 06:51:44 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2024/01/13 04:24:28 riastradh Exp $
+# $NetBSD: Makefile,v 1.31 2024/01/23 06:51:44 adam Exp $
 
 .include "dist.mk"
 
@@ -71,13 +71,13 @@ CONFIGURE_ARGS.NetBSD+=     ac_cv_file__dev_
 ALL_ENV+=              \
        _PYTHON_HOST_PLATFORM=${LOWER_OPSYS}-${MACHINE_GNU_ARCH}
 ALL_ENV+=              \
-       _PYTHON_PROJECT_BASE=${WRKSRC:Q}
+       _PYTHON_PROJECT_BASE=${WRKSRC}
 ALL_ENV+=              \
        _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata_${PY_PLATNAME:Q}
 .endif
 
 # http://bugs.python.org/issue13241
-.if !empty(MACHINE_PLATFORM:MDarwin-1[12].*)
+.if ${MACHINE_PLATFORM:MDarwin-1[12].*}
 PKGSRC_COMPILER=       clang
 PKG_CC=                        clang
 PKG_CXX=               clang++

Index: pkgsrc/lang/python310/distinfo
diff -u pkgsrc/lang/python310/distinfo:1.28 pkgsrc/lang/python310/distinfo:1.29
--- pkgsrc/lang/python310/distinfo:1.28 Sat Jan 13 04:24:28 2024
+++ pkgsrc/lang/python310/distinfo      Tue Jan 23 06:51:44 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.28 2024/01/13 04:24:28 riastradh Exp $
+$NetBSD: distinfo,v 1.29 2024/01/23 06:51:44 adam Exp $
 
 BLAKE2s (Python-3.10.13.tar.xz) = c714daeb2437980ce940e76db70f037d844bcddc06dddb6ac966cef281a2b514
 SHA512 (Python-3.10.13.tar.xz) = 7579772e501486b2b07f78142082dee1e99c7643640098860ac0cf2ca87daf7588b0c00b1db1960146b37f56a6ed98fd08297c25c9a19b612cf6e6a258984da8
@@ -16,4 +16,4 @@ SHA1 (patch-Modules_socketmodule.h) = 87
 SHA1 (patch-Python_thread__pthread.h) = b8efa178380fe48da4a0bf2bfa906851a314824e
 SHA1 (patch-configure) = 8ffe98e51407d10e46e7d1531f2e0e0b58e1cfa6
 SHA1 (patch-pyconfig.h.in) = 1ab77914315acbf0352d242ed66200bea54548f6
-SHA1 (patch-setup.py) = 5d1907202ad38286b92f41a553f34cf87c965213
+SHA1 (patch-setup.py) = 8a1787224e1367bd74bafc8d34dc4e6e5a7dcf68

Index: pkgsrc/lang/python310/patches/patch-setup.py
diff -u pkgsrc/lang/python310/patches/patch-setup.py:1.8 pkgsrc/lang/python310/patches/patch-setup.py:1.9
--- pkgsrc/lang/python310/patches/patch-setup.py:1.8    Sat Jan 13 04:24:28 2024
+++ pkgsrc/lang/python310/patches/patch-setup.py        Tue Jan 23 06:51:45 2024
@@ -1,4 +1,4 @@
-$NetBSD: patch-setup.py,v 1.8 2024/01/13 04:24:28 riastradh Exp $
+$NetBSD: patch-setup.py,v 1.9 2024/01/23 06:51:45 adam Exp $
 
 Disable certain modules, so they can be built as separate packages.
 Do not look for ncursesw.
@@ -102,7 +102,7 @@ shoelaces when cross-compiling.
              # This should work on any unixy platform ;-)
              # If the user has bothered specifying additional -I and -L flags
              # in OPT and LDFLAGS we might as well use them here.
-@@ -1067,71 +1088,10 @@ class PyBuildExt(build_ext):
+@@ -1067,71 +1088,12 @@ class PyBuildExt(build_ext):
      def detect_readline_curses(self):
          # readline
          readline_termcap_library = ""
@@ -161,8 +161,8 @@ shoelaces when cross-compiling.
 +        do_readline = True
 +        readline_lib = 'readline'
  
--        if MACOS:
--            os_release = int(os.uname()[2].split('.')[0])
+         if MACOS:
+             os_release = int(os.uname()[2].split('.')[0])
 -            dep_target = sysconfig.get_config_var('MACOSX_DEPLOYMENT_TARGET')
 -            if (dep_target and
 -                    (tuple(int(n) for n in dep_target.split('.')[0:2])
@@ -177,7 +177,7 @@ shoelaces when cross-compiling.
          if do_readline:
              if MACOS and os_release < 9:
                  # In every directory on the search path search for a dynamic
-@@ -1213,8 +1173,7 @@ class PyBuildExt(build_ext):
+@@ -1213,8 +1175,7 @@ class PyBuildExt(build_ext):
          # If the curses module is enabled, check for the panel module
          # _curses_panel needs some form of ncurses
          skip_curses_panel = True if AIX else False
@@ -187,7 +187,7 @@ shoelaces when cross-compiling.
              self.add(Extension('_curses_panel', ['_curses_panel.c'],
                             include_dirs=curses_includes,
                             define_macros=curses_defines,
-@@ -1459,6 +1418,31 @@ class PyBuildExt(build_ext):
+@@ -1459,6 +1420,31 @@ class PyBuildExt(build_ext):
          dbm_order = ['gdbm']
          # The standard Unix dbm module:
          if not CYGWIN:
@@ -219,7 +219,7 @@ shoelaces when cross-compiling.
              config_args = [arg.strip("'")
                             for arg in sysconfig.get_config_var("CONFIG_ARGS").split()]
              dbm_args = [arg for arg in config_args
-@@ -1470,7 +1454,7 @@ class PyBuildExt(build_ext):
+@@ -1470,7 +1456,7 @@ class PyBuildExt(build_ext):
              dbmext = None
              for cand in dbm_order:
                  if cand == "ndbm":
@@ -228,7 +228,7 @@ shoelaces when cross-compiling.
                          # Some systems have -lndbm, others have -lgdbm_compat,
                          # others don't have either
                          if self.compiler.find_library_file(self.lib_dirs,
-@@ -2333,10 +2317,7 @@ class PyBuildExt(build_ext):
+@@ -2333,10 +2319,7 @@ class PyBuildExt(build_ext):
              sources = ['_decimal/_decimal.c']
              depends = ['_decimal/docstrings.h']
          else:
@@ -240,7 +240,7 @@ shoelaces when cross-compiling.
              libraries = ['m']
              sources = [
                '_decimal/_decimal.c',
-@@ -2752,7 +2733,7 @@ def main():
+@@ -2752,7 +2735,7 @@ def main():
            # If you change the scripts installed here, you also need to
            # check the PyBuildScripts command above, and change the links
            # created by the bininstall target in Makefile.pre.in

Index: pkgsrc/lang/python39/Makefile
diff -u pkgsrc/lang/python39/Makefile:1.34 pkgsrc/lang/python39/Makefile:1.35
--- pkgsrc/lang/python39/Makefile:1.34  Fri Nov 10 16:55:32 2023
+++ pkgsrc/lang/python39/Makefile       Tue Jan 23 06:51:44 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2023/11/10 16:55:32 nia Exp $
+# $NetBSD: Makefile,v 1.35 2024/01/23 06:51:44 adam Exp $
 
 .include "dist.mk"
 
@@ -67,7 +67,7 @@ CONFIGURE_ARGS+=      ac_cv_buggy_getaddrinfo
 .  endif
 CONFIGURE_ARGS.NetBSD+=        ac_cv_file__dev_ptmx=yes
 CONFIGURE_ARGS.NetBSD+=        ac_cv_file__dev_ptc=no
-ALL_ENV+=              _PYTHON_PROJECT_BASE=${WRKSRC:Q}
+ALL_ENV+=              _PYTHON_PROJECT_BASE=${WRKSRC}
 ALL_ENV+=              \
        _PYTHON_HOST_PLATFORM=${LOWER_OPSYS}-${MACHINE_GNU_ARCH}
 ALL_ENV+=              \

Index: pkgsrc/lang/python39/distinfo
diff -u pkgsrc/lang/python39/distinfo:1.38 pkgsrc/lang/python39/distinfo:1.39
--- pkgsrc/lang/python39/distinfo:1.38  Sat Jan 13 04:24:28 2024
+++ pkgsrc/lang/python39/distinfo       Tue Jan 23 06:51:44 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.38 2024/01/13 04:24:28 riastradh Exp $
+$NetBSD: distinfo,v 1.39 2024/01/23 06:51:44 adam Exp $
 
 BLAKE2s (Python-3.9.18.tar.xz) = 429256eb52e94427ae86302633ce8b01ba42d37c44c59e89fa0ae09b721da63f
 SHA512 (Python-3.9.18.tar.xz) = aab155aca757d298394eddb91ff9a8f239665bd46feb495c6b6f735bbcb7489c05c858cc4cd08f1575c24f293b33492d763e9a140d92f0b2b0cc81a165a677c7
@@ -21,4 +21,4 @@ SHA1 (patch-Modules_socketmodule.h) = 87
 SHA1 (patch-Python_thread__pthread.h) = 25609f722ac9c17a49023ddc6882545d9d7798ff
 SHA1 (patch-configure) = 944b8bb9601fd064333305778fb57997ce0ac531
 SHA1 (patch-pyconfig.h.in) = 2f06af7358690b46eaff404226b898962b049a0e
-SHA1 (patch-setup.py) = 185090e3497763ca271316b5ff4df7f1e72d1c14
+SHA1 (patch-setup.py) = 7c2908dedbf40b7da989f6c105f6dc4e39942715

Index: pkgsrc/lang/python39/patches/patch-setup.py
diff -u pkgsrc/lang/python39/patches/patch-setup.py:1.11 pkgsrc/lang/python39/patches/patch-setup.py:1.12
--- pkgsrc/lang/python39/patches/patch-setup.py:1.11    Sat Jan 13 04:24:29 2024
+++ pkgsrc/lang/python39/patches/patch-setup.py Tue Jan 23 06:51:44 2024
@@ -1,4 +1,4 @@
-$NetBSD: patch-setup.py,v 1.11 2024/01/13 04:24:29 riastradh Exp $
+$NetBSD: patch-setup.py,v 1.12 2024/01/23 06:51:44 adam Exp $
 
 Disable certain modules, so they can be built as separate packages.
 Do not look for ncursesw.
@@ -103,7 +103,7 @@ shoelaces when cross-compiling.
              # This should work on any unixy platform ;-)
              # If the user has bothered specifying additional -I and -L flags
              # in OPT and LDFLAGS we might as well use them here.
-@@ -971,65 +991,10 @@ class PyBuildExt(build_ext):
+@@ -971,65 +991,12 @@ class PyBuildExt(build_ext):
  
      def detect_readline_curses(self):
          # readline
@@ -155,8 +155,8 @@ shoelaces when cross-compiling.
 -            curses_library = 'curses'
 +        curses_library = "ncurses"
  
--        if MACOS:
--            os_release = int(os.uname()[2].split('.')[0])
+         if MACOS:
+             os_release = int(os.uname()[2].split('.')[0])
 -            dep_target = sysconfig.get_config_var('MACOSX_DEPLOYMENT_TARGET')
 -            if (dep_target and
 -                    (tuple(int(n) for n in dep_target.split('.')[0:2])
@@ -171,7 +171,7 @@ shoelaces when cross-compiling.
          if do_readline:
              if MACOS and os_release < 9:
                  # In every directory on the search path search for a dynamic
-@@ -1109,8 +1074,7 @@ class PyBuildExt(build_ext):
+@@ -1109,8 +1076,7 @@ class PyBuildExt(build_ext):
          # If the curses module is enabled, check for the panel module
          # _curses_panel needs some form of ncurses
          skip_curses_panel = True if AIX else False
@@ -181,7 +181,7 @@ shoelaces when cross-compiling.
              self.add(Extension('_curses_panel', ['_curses_panel.c'],
                             include_dirs=curses_includes,
                             define_macros=curses_defines,
-@@ -1361,6 +1325,31 @@ class PyBuildExt(build_ext):
+@@ -1361,6 +1327,31 @@ class PyBuildExt(build_ext):
          dbm_order = ['gdbm']
          # The standard Unix dbm module:
          if not CYGWIN:
@@ -213,7 +213,7 @@ shoelaces when cross-compiling.
              config_args = [arg.strip("'")
                             for arg in sysconfig.get_config_var("CONFIG_ARGS").split()]
              dbm_args = [arg for arg in config_args
-@@ -1372,7 +1361,7 @@ class PyBuildExt(build_ext):
+@@ -1372,7 +1363,7 @@ class PyBuildExt(build_ext):
              dbmext = None
              for cand in dbm_order:
                  if cand == "ndbm":
@@ -222,7 +222,7 @@ shoelaces when cross-compiling.
                          # Some systems have -lndbm, others have -lgdbm_compat,
                          # others don't have either
                          if self.compiler.find_library_file(self.lib_dirs,
-@@ -2209,10 +2198,7 @@ class PyBuildExt(build_ext):
+@@ -2209,10 +2200,7 @@ class PyBuildExt(build_ext):
              sources = ['_decimal/_decimal.c']
              depends = ['_decimal/docstrings.h']
          else:
@@ -234,7 +234,7 @@ shoelaces when cross-compiling.
              libraries = ['m']
              sources = [
                '_decimal/_decimal.c',
-@@ -2597,7 +2583,7 @@ def main():
+@@ -2597,7 +2585,7 @@ def main():
            # If you change the scripts installed here, you also need to
            # check the PyBuildScripts command above, and change the links
            # created by the bininstall target in Makefile.pre.in

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/devel/py-test-random-order
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/devel/py-test-random-order
Indexes:

Home | Main Index | Thread Index | Old Index