Files
Joshua Root d86b2ba3a4 python34: update to 3.4.8
Likewise py34-gdbm and py34-tkinter.
2018-02-05 16:43:10 +11:00

47 lines
1.9 KiB
Diff

--- setup.py.orig 2018-02-05 10:40:38.000000000 +1100
+++ setup.py 2018-02-05 16:07:04.000000000 +1100
@@ -39,7 +39,7 @@
COMPILED_WITH_PYDEBUG = ('--with-pydebug' in sysconfig.get_config_var("CONFIG_ARGS"))
# This global variable is used to hold the list of modules to be disabled.
-disabled_module_list = []
+disabled_module_list = ["_tkinter", "_gdbm"]
def add_dir_to_list(dirlist, dir):
"""Add the directory 'dir' to the list 'dirlist' (after any relative
@@ -447,12 +447,6 @@
os.unlink(tmpfile)
def detect_modules(self):
- # 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_gcc_paths()
@@ -1691,7 +1685,8 @@
def detect_tkinter(self, inc_dirs, lib_dirs):
# The _tkinter module.
-
+ # Skip building; provided by a separate port in MacPorts.
+ return
# Check whether --with-tcltk-includes and --with-tcltk-libs were
# configured or passed into the make target. If so, use these values
# to build tkinter and bypass the searches for Tcl and TK in standard
@@ -1937,11 +1932,6 @@
if not '--with-system-ffi' in sysconfig.get_config_var("CONFIG_ARGS"):
return
- if host_platform == 'darwin':
- # OS X 10.5 comes with libffi.dylib; the include files are
- # in /usr/include/ffi
- inc_dirs.append('/usr/include/ffi')
-
ffi_inc = [sysconfig.get_config_var("LIBFFI_INCLUDEDIR")]
if not ffi_inc or ffi_inc[0] == '':
ffi_inc = find_file('ffi.h', [], inc_dirs)