2021-11-08 09:47:02 +11:00
|
|
|
--- setup.py.orig 2021-11-06 06:21:41.000000000 +1100
|
|
|
|
|
+++ setup.py 2021-11-08 09:33:45.000000000 +1100
|
2021-05-08 04:29:21 +10:00
|
|
|
@@ -44,7 +44,7 @@
|
2019-11-20 21:47:20 +11:00
|
|
|
TEST_EXTENSIONS = True
|
|
|
|
|
|
|
|
|
|
# This global variable is used to hold the list of modules to be disabled.
|
|
|
|
|
-DISABLED_MODULE_LIST = []
|
|
|
|
|
+DISABLED_MODULE_LIST = ['_tkinter', '_gdbm']
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def get_platform():
|
2021-11-08 09:47:02 +11:00
|
|
|
@@ -731,9 +731,6 @@
|
2019-11-20 21:47:20 +11:00
|
|
|
# Ensure that /usr/local is always used, but the local build
|
|
|
|
|
# directories (i.e. '.' and 'Include') must be first. See issue
|
|
|
|
|
# 10520.
|
|
|
|
|
- if not CROSS_COMPILING:
|
|
|
|
|
- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
|
|
|
|
|
- add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
|
|
|
|
|
# only change this for cross builds for 3.3, issues on Mageia
|
|
|
|
|
if CROSS_COMPILING:
|
|
|
|
|
self.add_cross_compiling_paths()
|
2021-11-08 09:47:02 +11:00
|
|
|
@@ -1773,10 +1770,7 @@
|
|
|
|
|
uuid_h = sysconfig.get_config_var("HAVE_UUID_H")
|
|
|
|
|
uuid_uuid_h = sysconfig.get_config_var("HAVE_UUID_UUID_H")
|
|
|
|
|
if uuid_h or uuid_uuid_h:
|
|
|
|
|
- if sysconfig.get_config_var("HAVE_LIBUUID"):
|
|
|
|
|
- uuid_libs = ["uuid"]
|
2021-05-08 04:29:21 +10:00
|
|
|
- else:
|
|
|
|
|
- uuid_libs = []
|
|
|
|
|
+ uuid_libs = []
|
|
|
|
|
self.add(Extension('_uuid', ['_uuidmodule.c'],
|
2021-11-08 09:47:02 +11:00
|
|
|
libraries=uuid_libs))
|
|
|
|
|
else:
|
|
|
|
|
@@ -1988,8 +1982,8 @@
|
2019-11-20 21:47:20 +11:00
|
|
|
# Rather than complicate the code below, detecting and building
|
|
|
|
|
# AquaTk is a separate method. Only one Tkinter will be built on
|
|
|
|
|
# Darwin - either AquaTk, if it is found, or X11 based Tk.
|
|
|
|
|
- if (MACOS and self.detect_tkinter_darwin()):
|
|
|
|
|
- return True
|
|
|
|
|
+ self.announce("INFO: Not using Tcl/Tk", 2)
|
|
|
|
|
+ return False
|
|
|
|
|
|
|
|
|
|
# Assume we haven't found any of the libraries or include files
|
|
|
|
|
# The versions with dots are used on Unix, and the versions without
|
