CVS commit: pkgsrc/lang

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Fri Jan 14 10:32:28 UTC 2022

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

Log Message:
python: fix build failure in default pkgsrc configuration

My previous patch intended to remove prefix /usr/pkg from sys.path during
build, but the regex ^/usr/pkg matches /usr/pkgsrc/lang/python39/work so
it ended unintentionally removing also the work directory in some cases.
Match instead on ^/usr/pkg/


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/lang/python310/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/python310/patches/patch-setup.py
cvs rdiff -u -r1.21 -r1.22 pkgsrc/lang/python39/distinfo
cvs rdiff -u -r1.6 -r1.7 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/distinfo
diff -u pkgsrc/lang/python310/distinfo:1.9 pkgsrc/lang/python310/distinfo:1.10
--- pkgsrc/lang/python310/distinfo:1.9  Wed Jan 12 08:49:01 2022
+++ pkgsrc/lang/python310/distinfo      Fri Jan 14 10:32:28 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2022/01/12 08:49:01 wiz Exp $
+$NetBSD: distinfo,v 1.10 2022/01/14 10:32:28 tnn Exp $
 
 BLAKE2s (Python-3.10.1.tar.xz) = a7004c16f0c40d927424d512cd5130cd2955315f50d804c289fc10d48f5a1d5c
 SHA512 (Python-3.10.1.tar.xz) = 1c559e33f1252e51bafb941c380de16f142c0735858363c84cb8dbed6767843de3af126889c2826ffb94bd4777d7cdfc31040301c8c74de56af52b80b1aa9e76
@@ -13,4 +13,4 @@ SHA1 (patch-Modules_socketmodule.h) = 87
 SHA1 (patch-Python_thread__pthread.h) = bf1aeab011b3afedc02e68fcf5cef091b3e0aefa
 SHA1 (patch-configure) = db79c9e00f2f804ff8497dbad0874658cc363db6
 SHA1 (patch-pyconfig.h.in) = 1ab77914315acbf0352d242ed66200bea54548f6
-SHA1 (patch-setup.py) = 0fe71d24fb58da914dd04a169ff2e3b75168726a
+SHA1 (patch-setup.py) = 491b5ff230dd6393fabe787b429a131c88a14f45

Index: pkgsrc/lang/python310/patches/patch-setup.py
diff -u pkgsrc/lang/python310/patches/patch-setup.py:1.3 pkgsrc/lang/python310/patches/patch-setup.py:1.4
--- pkgsrc/lang/python310/patches/patch-setup.py:1.3    Tue Jan 11 15:13:20 2022
+++ pkgsrc/lang/python310/patches/patch-setup.py        Fri Jan 14 10:32:28 2022
@@ -1,4 +1,4 @@
-$NetBSD: patch-setup.py,v 1.3 2022/01/11 15:13:20 tnn Exp $
+$NetBSD: patch-setup.py,v 1.4 2022/01/14 10:32:28 tnn Exp $
 
 Disable certain modules, so they can be built as separate packages.
 Do not look for ncursesw.
@@ -13,7 +13,7 @@ Don't search for modules in PREFIX. Fixe
  from glob import glob, escape
  import _osx_support
  
-+sys.path = [p for p in sys.path if not re.compile('^' + sys.base_prefix).match(p)]
++sys.path = [p for p in sys.path if not re.compile('^' + sys.base_prefix + '/').match(p)]
  
  try:
      import subprocess

Index: pkgsrc/lang/python39/distinfo
diff -u pkgsrc/lang/python39/distinfo:1.21 pkgsrc/lang/python39/distinfo:1.22
--- pkgsrc/lang/python39/distinfo:1.21  Wed Jan 12 08:49:01 2022
+++ pkgsrc/lang/python39/distinfo       Fri Jan 14 10:32:28 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.21 2022/01/12 08:49:01 wiz Exp $
+$NetBSD: distinfo,v 1.22 2022/01/14 10:32:28 tnn Exp $
 
 BLAKE2s (Python-3.9.9.tar.xz) = bb0cf5c1cb3212d82b69ab4e965f03b77736610c84bd032f31a5debdd25e6a30
 SHA512 (Python-3.9.9.tar.xz) = 0ab29fb9a7ecb808bd08d84d28908d5a934e0f021853da0f7a9c94670eb30c8dbbc233d461afdb3995b0de59275ef7e1de43e82d7f848802cbd6e6e50b7b25a6
@@ -18,4 +18,4 @@ SHA1 (patch-Modules_socketmodule.h) = 87
 SHA1 (patch-Python_thread__pthread.h) = fb81eaa604b4ed7c1b64c3f4731d58a8aee257be
 SHA1 (patch-configure) = d44439b22e8444141e2632b9fd9b1f343b38b712
 SHA1 (patch-pyconfig.h.in) = 2f06af7358690b46eaff404226b898962b049a0e
-SHA1 (patch-setup.py) = 7bb1307806954f65c9e21d376f28554501f658ac
+SHA1 (patch-setup.py) = 58cb7c277962a89586631f8f2c953e451537690a

Index: pkgsrc/lang/python39/patches/patch-setup.py
diff -u pkgsrc/lang/python39/patches/patch-setup.py:1.6 pkgsrc/lang/python39/patches/patch-setup.py:1.7
--- pkgsrc/lang/python39/patches/patch-setup.py:1.6     Tue Jan 11 15:13:20 2022
+++ pkgsrc/lang/python39/patches/patch-setup.py Fri Jan 14 10:32:28 2022
@@ -1,4 +1,4 @@
-$NetBSD: patch-setup.py,v 1.6 2022/01/11 15:13:20 tnn Exp $
+$NetBSD: patch-setup.py,v 1.7 2022/01/14 10:32:28 tnn Exp $
 
 Disable certain modules, so they can be built as separate packages.
 Do not look for ncursesw.
@@ -13,7 +13,7 @@ Don't search for modules in PREFIX. Fixe
  from glob import glob, escape
  import _osx_support
  
-+sys.path = [p for p in sys.path if not re.compile('^' + sys.base_prefix).match(p)]
++sys.path = [p for p in sys.path if not re.compile('^' + sys.base_prefix + '/').match(p)]
  
  try:
      import subprocess