diff options
Diffstat (limited to 'meta/recipes-devtools/python/python3/python-3.3-multilib.patch')
| -rw-r--r-- | meta/recipes-devtools/python/python3/python-3.3-multilib.patch | 116 |
1 files changed, 58 insertions, 58 deletions
diff --git a/meta/recipes-devtools/python/python3/python-3.3-multilib.patch b/meta/recipes-devtools/python/python3/python-3.3-multilib.patch index 44ec424cd2..056e8e7631 100644 --- a/meta/recipes-devtools/python/python3/python-3.3-multilib.patch +++ b/meta/recipes-devtools/python/python3/python-3.3-multilib.patch @@ -7,10 +7,10 @@ get the sys.lib from python itself and do not use hardcoded value of 'lib' Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com> -Index: Python-3.5.0/Include/pythonrun.h +Index: Python-3.5.2/Include/pythonrun.h =================================================================== ---- Python-3.5.0.orig/Include/pythonrun.h -+++ Python-3.5.0/Include/pythonrun.h +--- Python-3.5.2.orig/Include/pythonrun.h ++++ Python-3.5.2/Include/pythonrun.h @@ -23,6 +23,9 @@ typedef struct { } PyCompilerFlags; #endif @@ -21,10 +21,10 @@ Index: Python-3.5.0/Include/pythonrun.h #ifndef Py_LIMITED_API PyAPI_FUNC(int) PyRun_SimpleStringFlags(const char *, PyCompilerFlags *); PyAPI_FUNC(int) PyRun_AnyFileFlags(FILE *, const char *, PyCompilerFlags *); -Index: Python-3.5.0/Lib/distutils/command/install.py +Index: Python-3.5.2/Lib/distutils/command/install.py =================================================================== ---- Python-3.5.0.orig/Lib/distutils/command/install.py -+++ Python-3.5.0/Lib/distutils/command/install.py +--- Python-3.5.2.orig/Lib/distutils/command/install.py ++++ Python-3.5.2/Lib/distutils/command/install.py @@ -19,6 +19,8 @@ from site import USER_BASE from site import USER_SITE HAS_USER_SITE = True @@ -43,23 +43,23 @@ Index: Python-3.5.0/Lib/distutils/command/install.py 'headers': '$base/include/python$py_version_short$abiflags/$dist_name', 'scripts': '$base/bin', 'data' : '$base', -Index: Python-3.5.0/Lib/pydoc.py +Index: Python-3.5.2/Lib/pydoc.py =================================================================== ---- Python-3.5.0.orig/Lib/pydoc.py -+++ Python-3.5.0/Lib/pydoc.py -@@ -393,7 +393,7 @@ class Doc: +--- Python-3.5.2.orig/Lib/pydoc.py ++++ Python-3.5.2/Lib/pydoc.py +@@ -384,7 +384,7 @@ class Doc: + docmodule = docclass = docroutine = docother = docproperty = docdata = fail - docloc = os.environ.get("PYTHONDOCS", self.PYTHONDOCS) + def getdocloc(self, object, +- basedir=os.path.join(sys.base_exec_prefix, "lib", ++ basedir=os.path.join(sys.base_exec_prefix, sys.lib, + "python%d.%d" % sys.version_info[:2])): + """Return the location of module docs or None""" -- basedir = os.path.join(sys.base_exec_prefix, "lib", -+ basedir = os.path.join(sys.base_exec_prefix, sys.lib, - "python%d.%d" % sys.version_info[:2]) - if (isinstance(object, type(os)) and - (object.__name__ in ('errno', 'exceptions', 'gc', 'imp', -Index: Python-3.5.0/Lib/trace.py +Index: Python-3.5.2/Lib/trace.py =================================================================== ---- Python-3.5.0.orig/Lib/trace.py -+++ Python-3.5.0/Lib/trace.py +--- Python-3.5.2.orig/Lib/trace.py ++++ Python-3.5.2/Lib/trace.py @@ -749,10 +749,10 @@ def main(argv=None): # should I also call expanduser? (after all, could use $HOME) @@ -73,11 +73,11 @@ Index: Python-3.5.0/Lib/trace.py "python" + sys.version[:3])) s = os.path.normpath(s) ignore_dirs.append(s) -Index: Python-3.5.0/Makefile.pre.in +Index: Python-3.5.2/Makefile.pre.in =================================================================== ---- Python-3.5.0.orig/Makefile.pre.in -+++ Python-3.5.0/Makefile.pre.in -@@ -101,6 +101,8 @@ PY_CORE_CFLAGS= $(PY_CFLAGS) $(PY_CFLAGS +--- Python-3.5.2.orig/Makefile.pre.in ++++ Python-3.5.2/Makefile.pre.in +@@ -106,6 +106,8 @@ PY_CORE_CFLAGS= $(PY_CFLAGS) $(PY_CFLAGS # Machine-dependent subdirectories MACHDEP= @MACHDEP@ @@ -86,7 +86,7 @@ Index: Python-3.5.0/Makefile.pre.in # Multiarch directory (may be empty) MULTIARCH= @MULTIARCH@ -@@ -120,7 +122,7 @@ LIBDIR= @libdir@ +@@ -125,7 +127,7 @@ LIBDIR= @libdir@ MANDIR= @mandir@ INCLUDEDIR= @includedir@ CONFINCLUDEDIR= $(exec_prefix)/include @@ -95,7 +95,7 @@ Index: Python-3.5.0/Makefile.pre.in ABIFLAGS= @ABIFLAGS@ # Detailed destination directories -@@ -729,6 +731,7 @@ Modules/getpath.o: $(srcdir)/Modules/get +@@ -755,6 +757,7 @@ Modules/getpath.o: $(srcdir)/Modules/get -DEXEC_PREFIX='"$(exec_prefix)"' \ -DVERSION='"$(VERSION)"' \ -DVPATH='"$(VPATH)"' \ @@ -103,7 +103,7 @@ Index: Python-3.5.0/Makefile.pre.in -o $@ $(srcdir)/Modules/getpath.c Programs/python.o: $(srcdir)/Programs/python.c -@@ -798,7 +801,7 @@ $(OPCODE_H): $(srcdir)/Lib/opcode.py $(O +@@ -835,7 +838,7 @@ $(OPCODE_H): $(srcdir)/Lib/opcode.py $(O Python/compile.o Python/symtable.o Python/ast.o: $(GRAMMAR_H) $(AST_H) Python/getplatform.o: $(srcdir)/Python/getplatform.c @@ -112,25 +112,25 @@ Index: Python-3.5.0/Makefile.pre.in Python/importdl.o: $(srcdir)/Python/importdl.c $(CC) -c $(PY_CORE_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c -Index: Python-3.5.0/Modules/getpath.c +Index: Python-3.5.2/Modules/getpath.c =================================================================== ---- Python-3.5.0.orig/Modules/getpath.c -+++ Python-3.5.0/Modules/getpath.c -@@ -117,9 +117,11 @@ - #define EXEC_PREFIX PREFIX +--- Python-3.5.2.orig/Modules/getpath.c ++++ Python-3.5.2/Modules/getpath.c +@@ -105,6 +105,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" VERSION ":" \ -- EXEC_PREFIX "/lib/python" VERSION "/lib-dynload" ++#ifndef PYTHONPATH +#define PYTHONPATH PREFIX "/" LIB_PYTHON ":" \ -+ EXEC_PREFIX "/" LIB_PYTHON "/lib-dynload" - #endif - ++ EXEC_PREFIX "/" LIB_PYTHON "/lib-dynload" ++#endif ++ #ifndef LANDMARK -@@ -130,6 +132,7 @@ static wchar_t prefix[MAXPATHLEN+1]; + #define LANDMARK L"os.py" + #endif +@@ -113,6 +120,7 @@ static wchar_t prefix[MAXPATHLEN+1]; static wchar_t exec_prefix[MAXPATHLEN+1]; static wchar_t progpath[MAXPATHLEN+1]; static wchar_t *module_search_path = NULL; @@ -138,10 +138,10 @@ Index: Python-3.5.0/Modules/getpath.c /* Get file status. Encode the path to the locale encoding. */ -Index: Python-3.5.0/Python/getplatform.c +Index: Python-3.5.2/Python/getplatform.c =================================================================== ---- Python-3.5.0.orig/Python/getplatform.c -+++ Python-3.5.0/Python/getplatform.c +--- Python-3.5.2.orig/Python/getplatform.c ++++ Python-3.5.2/Python/getplatform.c @@ -10,3 +10,23 @@ Py_GetPlatform(void) { return PLATFORM; @@ -166,11 +166,11 @@ Index: Python-3.5.0/Python/getplatform.c +{ + return LIB; +} -Index: Python-3.5.0/Python/sysmodule.c +Index: Python-3.5.2/Python/sysmodule.c =================================================================== ---- Python-3.5.0.orig/Python/sysmodule.c -+++ Python-3.5.0/Python/sysmodule.c -@@ -1767,6 +1767,10 @@ _PySys_Init(void) +--- Python-3.5.2.orig/Python/sysmodule.c ++++ Python-3.5.2/Python/sysmodule.c +@@ -1790,6 +1790,10 @@ _PySys_Init(void) PyUnicode_FromString(Py_GetCopyright())); SET_SYS_FROM_STRING("platform", PyUnicode_FromString(Py_GetPlatform())); @@ -181,11 +181,11 @@ Index: Python-3.5.0/Python/sysmodule.c SET_SYS_FROM_STRING("executable", PyUnicode_FromWideChar( Py_GetProgramFullPath(), -1)); -Index: Python-3.5.0/setup.py +Index: Python-3.5.2/setup.py =================================================================== ---- Python-3.5.0.orig/setup.py -+++ Python-3.5.0/setup.py -@@ -472,7 +472,7 @@ class PyBuildExt(build_ext): +--- Python-3.5.2.orig/setup.py ++++ Python-3.5.2/setup.py +@@ -492,7 +492,7 @@ class PyBuildExt(build_ext): # directories (i.e. '.' and 'Include') must be first. See issue # 10520. if not cross_compiling: @@ -194,7 +194,7 @@ Index: Python-3.5.0/setup.py add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') # only change this for cross builds for 3.3, issues on Mageia if cross_compiling: -@@ -530,8 +530,7 @@ class PyBuildExt(build_ext): +@@ -550,8 +550,7 @@ class PyBuildExt(build_ext): # be assumed that no additional -I,-L directives are needed. if not cross_compiling: lib_dirs = self.compiler.library_dirs + [ @@ -204,7 +204,7 @@ Index: Python-3.5.0/setup.py ] inc_dirs = self.compiler.include_dirs + ['/usr/include'] else: -@@ -716,11 +715,11 @@ class PyBuildExt(build_ext): +@@ -743,11 +742,11 @@ class PyBuildExt(build_ext): elif curses_library: readline_libs.append(curses_library) elif self.compiler.find_library_file(lib_dirs + @@ -218,10 +218,10 @@ Index: Python-3.5.0/setup.py extra_link_args=readline_extra_link_args, libraries=readline_libs) ) else: -Index: Python-3.5.0/Lib/sysconfig.py +Index: Python-3.5.2/Lib/sysconfig.py =================================================================== ---- Python-3.5.0.orig/Lib/sysconfig.py -+++ Python-3.5.0/Lib/sysconfig.py +--- Python-3.5.2.orig/Lib/sysconfig.py ++++ Python-3.5.2/Lib/sysconfig.py @@ -20,10 +20,10 @@ __all__ = [ _INSTALL_SCHEMES = { @@ -264,11 +264,11 @@ Index: Python-3.5.0/Lib/sysconfig.py 'include': '{userbase}/include/python{py_version_short}', 'scripts': '{userbase}/bin', 'data': '{userbase}', -Index: Python-3.5.0/configure.ac +Index: Python-3.5.2/configure.ac =================================================================== ---- Python-3.5.0.orig/configure.ac -+++ Python-3.5.0/configure.ac -@@ -858,6 +858,41 @@ PLATDIR=plat-$MACHDEP +--- Python-3.5.2.orig/configure.ac ++++ Python-3.5.2/configure.ac +@@ -876,6 +876,41 @@ PLATDIR=plat-$MACHDEP AC_SUBST(PLATDIR) AC_SUBST(PLATFORM_TRIPLET) |