Files

45 lines
1.9 KiB
Diff
Raw Permalink Normal View History

2021-05-08 05:04:35 +10:00
--- setup.py.orig 2021-05-03 19:47:56.000000000 +1000
+++ setup.py 2021-05-08 04:51:51.000000000 +1000
@@ -25,7 +25,7 @@
2019-06-18 13:34:03 +02:00
TEST_EXTENSIONS = True
2018-09-19 16:43:02 +08:00
# This global variable is used to hold the list of modules to be disabled.
2019-06-18 13:34:03 +02:00
-DISABLED_MODULE_LIST = []
+DISABLED_MODULE_LIST = ['_tkinter', '_gdbm']
2019-06-18 13:34:03 +02:00
def get_platform():
2021-05-08 05:04:35 +10:00
@@ -633,9 +633,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()
2021-05-08 05:04:35 +10:00
@@ -1660,10 +1657,7 @@
# Build the _uuid module if possible
uuid_incs = find_file("uuid.h", self.inc_dirs, ["/usr/include/uuid"])
if uuid_incs is not None:
- if self.compiler.find_library_file(self.lib_dirs, 'uuid'):
- uuid_libs = ['uuid']
- else:
- uuid_libs = []
+ uuid_libs = []
self.add(Extension('_uuid', ['_uuidmodule.c'],
libraries=uuid_libs,
include_dirs=uuid_incs))
@@ -1836,8 +1830,8 @@
2018-09-19 16:43:02 +08: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.
2019-06-18 13:34:03 +02:00
- if (MACOS and self.detect_tkinter_darwin()):
- return True
2018-09-19 16:43:02 +08:00
+ self.announce("INFO: Not using Tcl/Tk", 2)
+ return False
2018-09-19 16:43:02 +08:00
# Assume we haven't found any of the libraries or include files
# The versions with dots are used on Unix, and the versions without