43 lines
1.8 KiB
Diff
43 lines
1.8 KiB
Diff
Upstream-Status: Inappropriate [embedded specific]
|
|
|
|
# We need to supply STAGING_INCDIR here, otherwise the Tk headers
|
|
# will not be found.
|
|
# Signed-Off: Michael 'Mickey' Lauer <mickey@vanille.de>
|
|
|
|
Index: Python-2.6.1/setup.py
|
|
===================================================================
|
|
--- Python-2.6.1.orig/setup.py
|
|
+++ Python-2.6.1/setup.py
|
|
@@ -1543,7 +1543,7 @@ class PyBuildExt(build_ext):
|
|
dotversion = dotversion[:-1] + '.' + dotversion[-1]
|
|
tcl_include_sub = []
|
|
tk_include_sub = []
|
|
- for dir in inc_dirs:
|
|
+ for dir in [os.getenv("STAGING_INCDIR")]:
|
|
tcl_include_sub += [dir + os.sep + "tcl" + dotversion]
|
|
tk_include_sub += [dir + os.sep + "tk" + dotversion]
|
|
tk_include_sub += tcl_include_sub
|
|
@@ -1562,22 +1562,6 @@ class PyBuildExt(build_ext):
|
|
if dir not in include_dirs:
|
|
include_dirs.append(dir)
|
|
|
|
- # Check for various platform-specific directories
|
|
- 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:
|
|
- # Assume default location for X11
|
|
- 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':
|
|
x11_inc = find_file('X11/Xlib.h', [], include_dirs)
|