diff options
Diffstat (limited to 'meta/recipes-devtools/python/python-native/multilib.patch')
-rw-r--r-- | meta/recipes-devtools/python/python-native/multilib.patch | 235 |
1 files changed, 0 insertions, 235 deletions
diff --git a/meta/recipes-devtools/python/python-native/multilib.patch b/meta/recipes-devtools/python/python-native/multilib.patch deleted file mode 100644 index af0f173c6d..0000000000 --- a/meta/recipes-devtools/python/python-native/multilib.patch +++ /dev/null @@ -1,235 +0,0 @@ -Rebased for Python 2.7.9 - -Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com> - -2011/09/29 -The python recipe building was failing because python-native -could not handle sys.lib var. sys.lib var is defined in the -multilib patch hence added this multilib.patch for python-native -recipe. - -Upstream-Status: Inappropriate [oe-specific] - -Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> - -Index: Python-2.7.14/Include/pythonrun.h -=================================================================== ---- Python-2.7.14.orig/Include/pythonrun.h -+++ Python-2.7.14/Include/pythonrun.h -@@ -108,6 +108,7 @@ PyAPI_FUNC(char *) Py_GetPath(void); - /* In their own files */ - PyAPI_FUNC(const char *) Py_GetVersion(void); - PyAPI_FUNC(const char *) Py_GetPlatform(void); -+PyAPI_FUNC(const char *) Py_GetLib(void); - PyAPI_FUNC(const char *) Py_GetCopyright(void); - PyAPI_FUNC(const char *) Py_GetCompiler(void); - PyAPI_FUNC(const char *) Py_GetBuildInfo(void); -Index: Python-2.7.14/Lib/distutils/command/install.py -=================================================================== ---- Python-2.7.14.orig/Lib/distutils/command/install.py -+++ Python-2.7.14/Lib/distutils/command/install.py -@@ -22,6 +22,8 @@ from site import USER_BASE - from site import USER_SITE - - -+libname = sys.lib -+ - if sys.version < "2.2": - WINDOWS_SCHEME = { - 'purelib': '$base', -@@ -42,7 +44,7 @@ else: - INSTALL_SCHEMES = { - 'unix_prefix': { - 'purelib': '$base/lib/python$py_version_short/site-packages', -- 'platlib': '$platbase/lib/python$py_version_short/site-packages', -+ 'platlib': '$platbase/'+libname+'/python$py_version_short/site-packages', - 'headers': '$base/include/python$py_version_short/$dist_name', - 'scripts': '$base/bin', - 'data' : '$base', -Index: Python-2.7.14/Lib/pydoc.py -=================================================================== ---- Python-2.7.14.orig/Lib/pydoc.py -+++ Python-2.7.14/Lib/pydoc.py -@@ -375,7 +375,7 @@ class Doc: - docmodule = docclass = docroutine = docother = docproperty = docdata = fail - - def getdocloc(self, object, -- basedir=os.path.join(sys.exec_prefix, "lib", -+ basedir=os.path.join(sys.exec_prefix, "sys.lib", - "python"+sys.version[0:3])): - """Return the location of module docs or None""" - -Index: Python-2.7.14/Lib/site.py -=================================================================== ---- Python-2.7.14.orig/Lib/site.py -+++ Python-2.7.14/Lib/site.py -@@ -288,13 +288,19 @@ def getsitepackages(): - if sys.platform in ('os2emx', 'riscos'): - sitepackages.append(os.path.join(prefix, "Lib", "site-packages")) - elif os.sep == '/': -- sitepackages.append(os.path.join(prefix, "lib", -+ sitepackages.append(os.path.join(prefix, sys.lib, - "python" + sys.version[:3], - "site-packages")) -- sitepackages.append(os.path.join(prefix, "lib", "site-python")) -+ if sys.lib != "lib": -+ sitepackages.append(os.path.join(prefix, "lib", -+ "python" + sys.version[:3], -+ "site-packages")) -+ sitepackages.append(os.path.join(prefix, sys.lib, "site-python")) -+ if sys.lib != "lib": -+ sitepackages.append(os.path.join(prefix, "lib", "site-python")) - else: - sitepackages.append(prefix) -- sitepackages.append(os.path.join(prefix, "lib", "site-packages")) -+ sitepackages.append(os.path.join(prefix, sys.lib, "site-packages")) - return sitepackages - - def addsitepackages(known_paths): -Index: Python-2.7.14/Lib/test/test_dl.py -=================================================================== ---- Python-2.7.14.orig/Lib/test/test_dl.py -+++ Python-2.7.14/Lib/test/test_dl.py -@@ -4,10 +4,11 @@ - import unittest - from test.test_support import verbose, import_module - dl = import_module('dl', deprecated=True) -+import sys - - sharedlibs = [ -- ('/usr/lib/libc.so', 'getpid'), -- ('/lib/libc.so.6', 'getpid'), -+ ('/usr/'+sys.lib+'/libc.so', 'getpid'), -+ ('/'+sys.lib+'/libc.so.6', 'getpid'), - ('/usr/bin/cygwin1.dll', 'getpid'), - ('/usr/lib/libc.dylib', 'getpid'), - ] -Index: Python-2.7.14/Lib/trace.py -=================================================================== ---- Python-2.7.14.orig/Lib/trace.py -+++ Python-2.7.14/Lib/trace.py -@@ -754,10 +754,10 @@ def main(argv=None): - # should I also call expanduser? (after all, could use $HOME) - - s = s.replace("$prefix", -- os.path.join(sys.prefix, "lib", -+ os.path.join(sys.prefix, sys.lib, - "python" + sys.version[:3])) - s = s.replace("$exec_prefix", -- os.path.join(sys.exec_prefix, "lib", -+ os.path.join(sys.exec_prefix, sys.lib, - "python" + sys.version[:3])) - s = os.path.normpath(s) - ignore_dirs.append(s) -Index: Python-2.7.14/Makefile.pre.in -=================================================================== ---- Python-2.7.14.orig/Makefile.pre.in -+++ Python-2.7.14/Makefile.pre.in -@@ -91,6 +91,7 @@ PY_CFLAGS= $(CFLAGS) $(CPPFLAGS) $(CFLAG - - # Machine-dependent subdirectories - MACHDEP= @MACHDEP@ -+LIB= @LIB@ - - # Multiarch directory (may be empty) - MULTIARCH= @MULTIARCH@ -@@ -110,7 +111,7 @@ LIBDIR= @libdir@ - MANDIR= @mandir@ - INCLUDEDIR= @includedir@ - CONFINCLUDEDIR= $(exec_prefix)/include --SCRIPTDIR= $(prefix)/lib -+SCRIPTDIR= $(prefix)/@LIB@ - - # Detailed destination directories - BINLIBDEST= $(LIBDIR)/python$(VERSION) -@@ -644,6 +645,7 @@ Modules/getpath.o: $(srcdir)/Modules/get - -DEXEC_PREFIX='"$(exec_prefix)"' \ - -DVERSION='"$(VERSION)"' \ - -DVPATH='"$(VPATH)"' \ -+ -DLIB='"$(LIB)"' \ - -o $@ $(srcdir)/Modules/getpath.c - - Modules/python.o: $(srcdir)/Modules/python.c -@@ -692,7 +694,7 @@ regen-ast: - Python/compile.o Python/symtable.o Python/ast.o: $(srcdir)/Include/graminit.h $(srcdir)/Include/Python-ast.h - - Python/getplatform.o: $(srcdir)/Python/getplatform.c -- $(CC) -c $(PY_CFLAGS) -DPLATFORM='"$(MACHDEP)"' -o $@ $(srcdir)/Python/getplatform.c -+ $(CC) -c $(PY_CFLAGS) -DPLATFORM='"$(MACHDEP)"' -DLIB='"$(LIB)"' -o $@ $(srcdir)/Python/getplatform.c - - Python/importdl.o: $(srcdir)/Python/importdl.c - $(CC) -c $(PY_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c -Index: Python-2.7.14/Modules/getpath.c -=================================================================== ---- Python-2.7.14.orig/Modules/getpath.c -+++ Python-2.7.14/Modules/getpath.c -@@ -100,6 +100,13 @@ - #error "PREFIX, EXEC_PREFIX, VERSION, and VPATH must be constant defined" - #endif - -+#define LIB_PYTHON LIB "/python" VERSION -+ -+#ifndef PYTHONPATH -+#define PYTHONPATH PREFIX "/" LIB_PYTHON ":" \ -+ EXEC_PREFIX "/" LIB_PYTHON "/lib-dynload" -+#endif -+ - #ifndef LANDMARK - #define LANDMARK "os.py" - #endif -@@ -108,7 +115,7 @@ static char prefix[MAXPATHLEN+1]; - static char exec_prefix[MAXPATHLEN+1]; - static char progpath[MAXPATHLEN+1]; - static char *module_search_path = NULL; --static char lib_python[] = "lib/python" VERSION; -+static char lib_python[] = LIB_PYTHON; - - static void - reduce(char *dir) -Index: Python-2.7.14/Python/getplatform.c -=================================================================== ---- Python-2.7.14.orig/Python/getplatform.c -+++ Python-2.7.14/Python/getplatform.c -@@ -10,3 +10,13 @@ Py_GetPlatform(void) - { - return PLATFORM; - } -+ -+#ifndef LIB -+#define LIB "lib" -+#endif -+ -+const char * -+Py_GetLib(void) -+{ -+ return LIB; -+} -Index: Python-2.7.14/Python/sysmodule.c -=================================================================== ---- Python-2.7.14.orig/Python/sysmodule.c -+++ Python-2.7.14/Python/sysmodule.c -@@ -1437,6 +1437,8 @@ _PySys_Init(void) - PyString_FromString(Py_GetCopyright())); - SET_SYS_FROM_STRING("platform", - PyString_FromString(Py_GetPlatform())); -+ SET_SYS_FROM_STRING("lib", -+ PyString_FromString(Py_GetLib())); - SET_SYS_FROM_STRING("executable", - PyString_FromString(Py_GetProgramFullPath())); - SET_SYS_FROM_STRING("prefix", -Index: Python-2.7.14/configure.ac -=================================================================== ---- Python-2.7.14.orig/configure.ac -+++ Python-2.7.14/configure.ac -@@ -758,6 +758,11 @@ SunOS*) - ;; - esac - -+AC_SUBST(LIB) -+AC_MSG_CHECKING(LIB) -+LIB=`basename ${libdir}` -+AC_MSG_RESULT($LIB) -+ - - AC_SUBST(LIBRARY) - AC_MSG_CHECKING(LIBRARY) |