1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-14 23:17:35 +00:00

Ports: Build Python with libuuid

This makes the _uuid module work :^)
This commit is contained in:
Linus Groh 2021-09-10 19:56:17 +01:00 committed by Andreas Kling
parent 8b3e1c0016
commit 6b15faed30
3 changed files with 18 additions and 3 deletions

View file

@ -1,5 +1,5 @@
--- Python-3.10.0rc1/setup.py 2021-08-03 18:59:05.650000000 +0100
+++ Python-3.10.0rc1/setup.py 2021-08-03 19:00:23.210495643 +0100
--- Python-3.10.0rc1/setup.py.orig 2021-08-02 20:53:59.000000000 +0100
+++ Python-3.10.0rc1/setup.py 2021-09-10 20:13:51.191781791 +0100
@@ -832,8 +832,8 @@
add_dir_to_list(self.compiler.include_dirs,
sysconfig.get_config_var("INCLUDEDIR"))
@ -25,3 +25,17 @@
panel_library = 'panel'
if curses_library == 'ncursesw':
curses_defines.append(('HAVE_NCURSESW', '1'))
@@ -1847,7 +1852,12 @@
def detect_uuid(self):
# Build the _uuid module if possible
- uuid_incs = find_file("uuid.h", self.inc_dirs, ["/usr/include/uuid"])
+ if not CROSS_COMPILING:
+ uuid_incs = find_file("uuid.h", self.inc_dirs, ["/usr/include/uuid", "/usr/local/include/uuid"])
+ else:
+ uuid_incs = find_file("uuid.h", self.inc_dirs, sysroot_paths(
+ ('CPPFLAGS', 'CFLAGS', 'CC'), ["/usr/include/uuid", "/usr/local/include/uuid"]
+ ))
if uuid_incs is not None:
if self.compiler.find_library_file(self.lib_dirs, 'uuid'):
uuid_libs = ['uuid']