CVS commit: pkgsrc/lang/python38

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

Module Name:    pkgsrc
Committed By:   tnn
Date:           Mon Mar 16 10:19:15 UTC 2020

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

Log Message:
python38: fix uuid/uuid.h detection


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/python38/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/python38/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/python38/distinfo
diff -u pkgsrc/lang/python38/distinfo:1.5 pkgsrc/lang/python38/distinfo:1.6
--- pkgsrc/lang/python38/distinfo:1.5   Thu Feb 27 14:33:02 2020
+++ pkgsrc/lang/python38/distinfo       Mon Mar 16 10:19:15 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2020/02/27 14:33:02 adam Exp $
+$NetBSD: distinfo,v 1.6 2020/03/16 10:19:15 tnn Exp $
 
 SHA1 (Python-3.8.2.tar.xz) = 5ae54baf26628a7ed74206650a31192e6d5c6f93
 RMD160 (Python-3.8.2.tar.xz) = 8a03650894857d2b7be679613646ad1fff22d98e
@@ -17,4 +17,4 @@ SHA1 (patch-Modules_socketmodule.h) = 13
 SHA1 (patch-Python_thread__pthread.h) = fb81eaa604b4ed7c1b64c3f4731d58a8aee257be
 SHA1 (patch-configure) = 21540fd8328ab721b04d09aae377caf2f2978f8c
 SHA1 (patch-pyconfig.h.in) = 4bc6e95441cb5faae94d1d52aeaaa10ae01385b6
-SHA1 (patch-setup.py) = b6f6fd38ad557680eba4878a9a03ec654c573361
+SHA1 (patch-setup.py) = 95dd9b0de63d32bdbd7f191cb191489d901f21cd

Index: pkgsrc/lang/python38/patches/patch-setup.py
diff -u pkgsrc/lang/python38/patches/patch-setup.py:1.1 pkgsrc/lang/python38/patches/patch-setup.py:1.2
--- pkgsrc/lang/python38/patches/patch-setup.py:1.1     Tue Oct 15 16:50:11 2019
+++ pkgsrc/lang/python38/patches/patch-setup.py Mon Mar 16 10:19:15 2020
@@ -1,4 +1,4 @@
-$NetBSD: patch-setup.py,v 1.1 2019/10/15 16:50:11 adam Exp $
+$NetBSD: patch-setup.py,v 1.2 2020/03/16 10:19:15 tnn Exp $
 
 Disable certain modules, so they can be built as separate packages.
 Do not look for ncursesw.
@@ -6,7 +6,7 @@ Assume panel_library is correct; this is
   which will get transformed to panel in buildlink.
 Also look for uuid/uuid.h.
 
---- setup.py.orig      2019-10-14 13:34:47.000000000 +0000
+--- setup.py.orig      2020-02-24 21:36:25.000000000 +0000
 +++ setup.py
 @@ -10,7 +10,7 @@ import sys
  import sysconfig
@@ -116,7 +116,7 @@ Also look for uuid/uuid.h.
          # Build the _uuid module if possible
          uuid_incs = find_file("uuid.h", self.inc_dirs, ["/usr/include/uuid"])
 +        if uuid_incs is None:
-+            uuid_incs = find_file("uuid/uuid.h", inc_dirs, [])
++            uuid_incs = find_file("uuid/uuid.h", self.inc_dirs, [])
          if uuid_incs is not None:
              if self.compiler.find_library_file(self.lib_dirs, 'uuid'):
                  uuid_libs = ['uuid']