-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathpatch-setup.py.diff
44 lines (41 loc) · 1.95 KB
/
patch-setup.py.diff
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
--- setup.py.orig 2021-12-07 05:23:39.000000000 +1100
+++ setup.py 2021-12-10 21:20:23.000000000 +1100
@@ -58,7 +58,7 @@
TEST_EXTENSIONS = (sysconfig.get_config_var('TEST_MODULES') == 'yes')
# This global variable is used to hold the list of modules to be disabled.
-DISABLED_MODULE_LIST = []
+DISABLED_MODULE_LIST = ['_tkinter', '_gdbm']
# --list-module-names option used by Tools/scripts/generate_module_names.py
LIST_MODULE_NAMES = False
@@ -824,9 +824,6 @@
# 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()
@@ -1868,10 +1865,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"]
- else:
- uuid_libs = []
+ uuid_libs = []
self.add(Extension('_uuid', ['_uuidmodule.c'],
libraries=uuid_libs))
else:
@@ -2107,8 +2101,8 @@
# 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