diff options
Diffstat (limited to 'meta/recipes-devtools/python/python/multilib.patch')
-rw-r--r-- | meta/recipes-devtools/python/python/multilib.patch | 126 |
1 files changed, 65 insertions, 61 deletions
diff --git a/meta/recipes-devtools/python/python/multilib.patch b/meta/recipes-devtools/python/python/multilib.patch index 33a334189e..babff1280e 100644 --- a/meta/recipes-devtools/python/python/multilib.patch +++ b/meta/recipes-devtools/python/python/multilib.patch @@ -10,10 +10,14 @@ Date: Tue Jun 28 21:21:29 2011 +0800 Picked-by: Yu Ke <ke.yu@intel.com> -Index: Python-2.6.6/Include/pythonrun.h +2011/09/29 +Rebased for python 2.7.2 +Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> + +Index: Python-2.7.2/Include/pythonrun.h =================================================================== ---- Python-2.6.6.orig/Include/pythonrun.h -+++ Python-2.6.6/Include/pythonrun.h +--- Python-2.7.2.orig/Include/pythonrun.h ++++ Python-2.7.2/Include/pythonrun.h @@ -108,6 +108,7 @@ PyAPI_FUNC(char *) Py_GetPath(void); /* In their own files */ PyAPI_FUNC(const char *) Py_GetVersion(void); @@ -22,10 +26,10 @@ Index: Python-2.6.6/Include/pythonrun.h PyAPI_FUNC(const char *) Py_GetCopyright(void); PyAPI_FUNC(const char *) Py_GetCompiler(void); PyAPI_FUNC(const char *) Py_GetBuildInfo(void); -Index: Python-2.6.6/Lib/distutils/command/install.py +Index: Python-2.7.2/Lib/distutils/command/install.py =================================================================== ---- Python-2.6.6.orig/Lib/distutils/command/install.py -+++ Python-2.6.6/Lib/distutils/command/install.py +--- Python-2.7.2.orig/Lib/distutils/command/install.py ++++ Python-2.7.2/Lib/distutils/command/install.py @@ -22,6 +22,8 @@ from site import USER_BASE from site import USER_SITE @@ -44,11 +48,11 @@ Index: Python-2.6.6/Lib/distutils/command/install.py 'headers': '$base/include/python$py_version_short/$dist_name', 'scripts': '$base/bin', 'data' : '$base', -Index: Python-2.6.6/Lib/distutils/sysconfig.py +Index: Python-2.7.2/Lib/distutils/sysconfig.py =================================================================== ---- Python-2.6.6.orig/Lib/distutils/sysconfig.py -+++ Python-2.6.6/Lib/distutils/sysconfig.py -@@ -119,8 +119,11 @@ def get_python_lib(plat_specific=0, stan +--- Python-2.7.2.orig/Lib/distutils/sysconfig.py ++++ Python-2.7.2/Lib/distutils/sysconfig.py +@@ -114,8 +114,11 @@ def get_python_lib(plat_specific=0, stan prefix = plat_specific and EXEC_PREFIX or PREFIX if os.name == "posix": @@ -62,11 +66,11 @@ Index: Python-2.6.6/Lib/distutils/sysconfig.py if standard_lib: return libpython else: -Index: Python-2.6.6/Lib/pydoc.py +Index: Python-2.7.2/Lib/pydoc.py =================================================================== ---- Python-2.6.6.orig/Lib/pydoc.py -+++ Python-2.6.6/Lib/pydoc.py -@@ -349,7 +349,7 @@ class Doc: +--- Python-2.7.2.orig/Lib/pydoc.py ++++ Python-2.7.2/Lib/pydoc.py +@@ -352,7 +352,7 @@ class Doc: docloc = os.environ.get("PYTHONDOCS", "http://docs.python.org/library") @@ -75,40 +79,40 @@ Index: Python-2.6.6/Lib/pydoc.py "python"+sys.version[0:3]) if (isinstance(object, type(os)) and (object.__name__ in ('errno', 'exceptions', 'gc', 'imp', -Index: Python-2.6.6/Lib/site.py +Index: Python-2.7.2/Lib/site.py =================================================================== ---- Python-2.6.6.orig/Lib/site.py -+++ Python-2.6.6/Lib/site.py -@@ -265,13 +265,19 @@ def addsitepackages(known_paths): +--- Python-2.7.2.orig/Lib/site.py ++++ Python-2.7.2/Lib/site.py +@@ -300,13 +300,19 @@ def getsitepackages(): if sys.platform in ('os2emx', 'riscos'): - sitedirs.append(os.path.join(prefix, "Lib", "site-packages")) + sitepackages.append(os.path.join(prefix, "Lib", "site-packages")) elif os.sep == '/': -- sitedirs.append(os.path.join(prefix, "lib", -+ sitedirs.append(os.path.join(prefix, sys.lib, +- sitepackages.append(os.path.join(prefix, "lib", ++ sitepackages.append(os.path.join(prefix, sys.lib, "python" + sys.version[:3], "site-packages")) -- sitedirs.append(os.path.join(prefix, "lib", "site-python")) +- sitepackages.append(os.path.join(prefix, "lib", "site-python")) + if sys.lib != "lib": -+ sitedirs.append(os.path.join(prefix, "lib", ++ sitepackages.append(os.path.join(prefix, "lib", + "python" + sys.version[:3], + "site-packages")) -+ sitedirs.append(os.path.join(prefix, sys.lib, "site-python")) ++ sitepackages.append(os.path.join(prefix, sys.lib, "site-python")) + if sys.lib != "lib": -+ sitedirs.append(os.path.join(prefix, "lib", "site-python")) ++ sitepackages.append(os.path.join(prefix, "lib", "site-python")) else: - sitedirs.append(prefix) -- sitedirs.append(os.path.join(prefix, "lib", "site-packages")) -+ sitedirs.append(os.path.join(prefix, sys.lib, "site-packages")) - + sitepackages.append(prefix) +- sitepackages.append(os.path.join(prefix, "lib", "site-packages")) ++ sitepackages.append(os.path.join(prefix, sys.lib, "site-packages")) if sys.platform == "darwin": # for framework builds *only* we add the standard Apple -Index: Python-2.6.6/Lib/test/test_dl.py + # locations. +Index: Python-2.7.2/Lib/test/test_dl.py =================================================================== ---- Python-2.6.6.orig/Lib/test/test_dl.py -+++ Python-2.6.6/Lib/test/test_dl.py -@@ -4,10 +4,11 @@ - """ - from test.test_support import verbose,TestSkipped, import_module +--- Python-2.7.2.orig/Lib/test/test_dl.py ++++ Python-2.7.2/Lib/test/test_dl.py +@@ -5,10 +5,11 @@ + import unittest + from test.test_support import verbose, import_module dl = import_module('dl', deprecated=True) +import sys @@ -120,11 +124,11 @@ Index: Python-2.6.6/Lib/test/test_dl.py ('/usr/bin/cygwin1.dll', 'getpid'), ('/usr/lib/libc.dylib', 'getpid'), ] -Index: Python-2.6.6/Lib/trace.py +Index: Python-2.7.2/Lib/trace.py =================================================================== ---- Python-2.6.6.orig/Lib/trace.py -+++ Python-2.6.6/Lib/trace.py -@@ -759,10 +759,10 @@ def main(argv=None): +--- Python-2.7.2.orig/Lib/trace.py ++++ Python-2.7.2/Lib/trace.py +@@ -762,10 +762,10 @@ def main(argv=None): # should I also call expanduser? (after all, could use $HOME) s = s.replace("$prefix", @@ -137,11 +141,11 @@ Index: Python-2.6.6/Lib/trace.py "python" + sys.version[:3])) s = os.path.normpath(s) ignore_dirs.append(s) -Index: Python-2.6.6/Makefile.pre.in +Index: Python-2.7.2/Makefile.pre.in =================================================================== ---- Python-2.6.6.orig/Makefile.pre.in -+++ Python-2.6.6/Makefile.pre.in -@@ -75,6 +75,7 @@ PY_CFLAGS= $(CFLAGS) $(CPPFLAGS) $(CFLAG +--- Python-2.7.2.orig/Makefile.pre.in ++++ Python-2.7.2/Makefile.pre.in +@@ -81,6 +81,7 @@ PY_CFLAGS= $(CFLAGS) $(CPPFLAGS) $(CFLAG # Machine-dependent subdirectories MACHDEP= @MACHDEP@ @@ -149,7 +153,7 @@ Index: Python-2.6.6/Makefile.pre.in # Install prefix for architecture-independent files prefix= @prefix@ -@@ -91,7 +92,7 @@ LIBDIR= @libdir@ +@@ -97,7 +98,7 @@ LIBDIR= @libdir@ MANDIR= @mandir@ INCLUDEDIR= @includedir@ CONFINCLUDEDIR= $(exec_prefix)/include @@ -158,7 +162,7 @@ Index: Python-2.6.6/Makefile.pre.in # Detailed destination directories BINLIBDEST= $(LIBDIR)/python$(VERSION) -@@ -509,6 +510,7 @@ Modules/getpath.o: $(srcdir)/Modules/get +@@ -533,6 +534,7 @@ Modules/getpath.o: $(srcdir)/Modules/get -DEXEC_PREFIX='"$(exec_prefix)"' \ -DVERSION='"$(VERSION)"' \ -DVPATH='"$(VPATH)"' \ @@ -166,8 +170,8 @@ Index: Python-2.6.6/Makefile.pre.in -o $@ $(srcdir)/Modules/getpath.c Modules/python.o: $(srcdir)/Modules/python.c -@@ -540,7 +542,7 @@ $(AST_C): $(AST_ASDL) $(ASDLGEN_FILES) - Python/compile.o Python/symtable.o: $(GRAMMAR_H) $(AST_H) +@@ -567,7 +569,7 @@ $(AST_C): $(AST_ASDL) $(ASDLGEN_FILES) + Python/compile.o Python/symtable.o Python/ast.o: $(GRAMMAR_H) $(AST_H) Python/getplatform.o: $(srcdir)/Python/getplatform.c - $(CC) -c $(PY_CFLAGS) -DPLATFORM='"$(MACHDEP)"' -o $@ $(srcdir)/Python/getplatform.c @@ -175,10 +179,10 @@ Index: Python-2.6.6/Makefile.pre.in Python/importdl.o: $(srcdir)/Python/importdl.c $(CC) -c $(PY_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c -Index: Python-2.6.6/Modules/getpath.c +Index: Python-2.7.2/Modules/getpath.c =================================================================== ---- Python-2.6.6.orig/Modules/getpath.c -+++ Python-2.6.6/Modules/getpath.c +--- Python-2.7.2.orig/Modules/getpath.c ++++ Python-2.7.2/Modules/getpath.c @@ -116,9 +116,11 @@ #define EXEC_PREFIX PREFIX #endif @@ -202,10 +206,10 @@ Index: Python-2.6.6/Modules/getpath.c static void reduce(char *dir) -Index: Python-2.6.6/Python/getplatform.c +Index: Python-2.7.2/Python/getplatform.c =================================================================== ---- Python-2.6.6.orig/Python/getplatform.c -+++ Python-2.6.6/Python/getplatform.c +--- Python-2.7.2.orig/Python/getplatform.c ++++ Python-2.7.2/Python/getplatform.c @@ -10,3 +10,13 @@ Py_GetPlatform(void) { return PLATFORM; @@ -220,11 +224,11 @@ Index: Python-2.6.6/Python/getplatform.c +{ + return LIB; +} -Index: Python-2.6.6/Python/sysmodule.c +Index: Python-2.7.2/Python/sysmodule.c =================================================================== ---- Python-2.6.6.orig/Python/sysmodule.c -+++ Python-2.6.6/Python/sysmodule.c -@@ -1379,6 +1379,8 @@ _PySys_Init(void) +--- Python-2.7.2.orig/Python/sysmodule.c ++++ Python-2.7.2/Python/sysmodule.c +@@ -1416,6 +1416,8 @@ _PySys_Init(void) PyString_FromString(Py_GetCopyright())); SET_SYS_FROM_STRING("platform", PyString_FromString(Py_GetPlatform())); @@ -233,11 +237,11 @@ Index: Python-2.6.6/Python/sysmodule.c SET_SYS_FROM_STRING("executable", PyString_FromString(Py_GetProgramFullPath())); SET_SYS_FROM_STRING("prefix", -Index: Python-2.6.6/configure.in +Index: Python-2.7.2/configure.in =================================================================== ---- Python-2.6.6.orig/configure.in -+++ Python-2.6.6/configure.in -@@ -613,6 +613,10 @@ SunOS*) +--- Python-2.7.2.orig/configure.in ++++ Python-2.7.2/configure.in +@@ -629,6 +629,10 @@ SunOS*) ;; esac |