tech-pkg archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[PATCH] python38: fix error when uuid.h is not available



inc_dirs is not in scope, causing an error during build:

    ...
      File "./setup.py", line 1736, in detect_modules
        self.detect_uuid()
      File "./setup.py", line 1700, in detect_uuid
        uuid_incs = find_file("uuid/uuid.h", inc_dirs, [])
    NameError: name 'inc_dirs' is not defined

self.inc_dirs is likely the intention here.
---
 lang/python38/distinfo               | 2 +-
 lang/python38/patches/patch-setup.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lang/python38/distinfo b/lang/python38/distinfo
index 430152b1813..39074699e43 100644
--- a/lang/python38/distinfo
+++ b/lang/python38/distinfo
@@ -17,4 +17,4 @@ SHA1 (patch-Modules_socketmodule.h) = 13a3290eb72078067060d3e71b7baa08f3eb591c
 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) = e1be786dbe76237d3cece598f65474643262438f
diff --git a/lang/python38/patches/patch-setup.py b/lang/python38/patches/patch-setup.py
index cd61f54d2af..b1f87fe28e7 100644
--- a/lang/python38/patches/patch-setup.py
+++ b/lang/python38/patches/patch-setup.py
@@ -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']
-- 
2.25.1



Home | Main Index | Thread Index | Old Index