mirror of
https://git.yoctoproject.org/poky
synced 2026-02-15 13:13:02 +01:00
29d6678fd5
Having one monolithic packages directory makes it hard to find things and is generally overwhelming. This commit splits it into several logical sections roughly based on function, recipes.txt gives more information about the classifications used. The opportunity is also used to switch from "packages" to "recipes" as used in OpenEmbedded as the term "packages" can be confusing to people and has many different meanings. Not all recipes have been classified yet, this is just a first pass at separating things out. Some packages are moved to meta-extras as they're no longer actively used or maintained. Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
41 lines
1.8 KiB
Diff
41 lines
1.8 KiB
Diff
# 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)
|