|
@@ -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 @@
|
|
@@ -832,8 +832,8 @@
|
|
add_dir_to_list(self.compiler.include_dirs,
|
|
add_dir_to_list(self.compiler.include_dirs,
|
|
sysconfig.get_config_var("INCLUDEDIR"))
|
|
sysconfig.get_config_var("INCLUDEDIR"))
|
|
@@ -25,3 +25,17 @@
|
|
panel_library = 'panel'
|
|
panel_library = 'panel'
|
|
if curses_library == 'ncursesw':
|
|
if curses_library == 'ncursesw':
|
|
curses_defines.append(('HAVE_NCURSESW', '1'))
|
|
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']
|