You've already forked macports-ports
mirror of
https://github.com/macports/macports-ports.git
synced 2026-07-12 18:20:25 -07:00
Mihai Moldovan
8c56e7151f
git-svn-id: https://svn.macports.org/repository/macports/trunk/dports@150874 d073be05-634f-4543-b044-5fe20cf6d1d6
54 lines
2.5 KiB
Diff
54 lines
2.5 KiB
Diff
--- setup.py.old 2014-10-12 08:52:04.000000000 +0200
|
|
+++ setup.py 2016-08-01 06:01:52.000000000 +0200
|
|
@@ -1493,7 +1493,7 @@ class PyBuildExt(build_ext):
|
|
# For 8.4a2, the X11 headers are not included. Rather than include a
|
|
# complicated search, this is a hard-coded path. It could bail out
|
|
# if X11 libs are not found...
|
|
- include_dirs.append('/usr/X11R6/include')
|
|
+ #include_dirs.append('/usr/X11R6/include')
|
|
frameworks = ['-framework', 'Tcl', '-framework', 'Tk']
|
|
|
|
# All existing framework builds of Tcl/Tk don't support 64-bit
|
|
@@ -1538,13 +1538,7 @@ class PyBuildExt(build_ext):
|
|
def detect_tkinter(self, inc_dirs, lib_dirs):
|
|
# The _tkinter module.
|
|
|
|
- # 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.
|
|
platform = self.get_platform()
|
|
- if (platform == 'darwin' and
|
|
- self.detect_tkinter_darwin(inc_dirs, lib_dirs)):
|
|
- return
|
|
|
|
# Assume we haven't found any of the libraries or include files
|
|
# The versions with dots are used on Unix, and the versions without
|
|
@@ -1594,17 +1588,17 @@ class PyBuildExt(build_ext):
|
|
if platform == 'sunos5':
|
|
include_dirs.append('/usr/openwin/include')
|
|
added_lib_dirs.append('/usr/openwin/lib')
|
|
- elif os.path.exists('/usr/X11R6/include'):
|
|
- include_dirs.append('/usr/X11R6/include')
|
|
- added_lib_dirs.append('/usr/X11R6/lib64')
|
|
- added_lib_dirs.append('/usr/X11R6/lib')
|
|
- elif os.path.exists('/usr/X11R5/include'):
|
|
- include_dirs.append('/usr/X11R5/include')
|
|
- added_lib_dirs.append('/usr/X11R5/lib')
|
|
- else:
|
|
+ #elif os.path.exists('/usr/X11R6/include'):
|
|
+ # include_dirs.append('/usr/X11R6/include')
|
|
+ # added_lib_dirs.append('/usr/X11R6/lib64')
|
|
+ # added_lib_dirs.append('/usr/X11R6/lib')
|
|
+ #elif os.path.exists('/usr/X11R5/include'):
|
|
+ # include_dirs.append('/usr/X11R5/include')
|
|
+ # added_lib_dirs.append('/usr/X11R5/lib')
|
|
+ #else:
|
|
# Assume default location for X11
|
|
- include_dirs.append('/usr/X11/include')
|
|
- added_lib_dirs.append('/usr/X11/lib')
|
|
+ # include_dirs.append('/usr/X11/include')
|
|
+ # added_lib_dirs.append('/usr/X11/lib')
|
|
|
|
# If Cygwin, then verify that X is installed before proceeding
|
|
if platform == 'cygwin':
|