bpo-45847: Port _uuid to PY_STDLIB_MOD (GH-29741)

python · Nov 24, 2021 · 8af6481 · 8af6481
1 parent d5cd2ef
commit 8af6481
Show file tree

Hide file tree

Showing 6 changed files with 391 additions and 74 deletions.
diff --git a/Modules/Setup.stdlib.in b/Modules/Setup.stdlib.in
@@ -136,6 +136,8 @@
 # needs -lcrypt
 @MODULE__HASHLIB_TRUE@_hashlib _hashopenssl.c
 
+# Linux: -luuid, BSD/AIX: libc's uuid_create()
+@MODULE__UUID_TRUE@_uuid _uuidmodule.c
 
 ############################################################################
 # macOS specific modules

diff --git a/Modules/_uuidmodule.c b/Modules/_uuidmodule.c
@@ -6,10 +6,12 @@
 #define PY_SSIZE_T_CLEAN
 
 #include "Python.h"
-#ifdef HAVE_UUID_UUID_H
-#include <uuid/uuid.h>
-#elif defined(HAVE_UUID_H)
-#include <uuid.h>
+#if defined(HAVE_UUID_H)
+  // AIX, FreeBSD, libuuid with pkgconf
+  #include <uuid.h>
+#elif defined(HAVE_UUID_UUID_H)
+  // libuuid without pkgconf
+  #include <uuid/uuid.h>
 #endif
 
 #ifdef MS_WINDOWS