diff options
Diffstat (limited to 'meta/recipes-devtools/python/python3')
| -rw-r--r-- | meta/recipes-devtools/python/python3/python-3.3-multilib.patch | 121 | ||||
| -rw-r--r-- | meta/recipes-devtools/python/python3/python3-use-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch | 12 |
2 files changed, 65 insertions, 68 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 08c4403cbf..77da6159c9 100644 --- a/meta/recipes-devtools/python/python3/python-3.3-multilib.patch +++ b/meta/recipes-devtools/python/python3/python-3.3-multilib.patch @@ -25,10 +25,10 @@ Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com> setup.py | 9 ++++----- 12 files changed, 97 insertions(+), 23 deletions(-) -diff --git a/Include/pythonrun.h b/Include/pythonrun.h -index 9c2e813..2f79cb6 100644 ---- a/Include/pythonrun.h -+++ b/Include/pythonrun.h +Index: Python-3.5.4/Include/pythonrun.h +=================================================================== +--- Python-3.5.4.orig/Include/pythonrun.h ++++ Python-3.5.4/Include/pythonrun.h @@ -23,6 +23,9 @@ typedef struct { } PyCompilerFlags; #endif @@ -39,10 +39,10 @@ index 9c2e813..2f79cb6 100644 #ifndef Py_LIMITED_API PyAPI_FUNC(int) PyRun_SimpleStringFlags(const char *, PyCompilerFlags *); PyAPI_FUNC(int) PyRun_AnyFileFlags(FILE *, const char *, PyCompilerFlags *); -diff --git a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py -index 67db007..b46b45b 100644 ---- a/Lib/distutils/command/install.py -+++ b/Lib/distutils/command/install.py +Index: Python-3.5.4/Lib/distutils/command/install.py +=================================================================== +--- Python-3.5.4.orig/Lib/distutils/command/install.py ++++ Python-3.5.4/Lib/distutils/command/install.py @@ -19,6 +19,8 @@ from site import USER_BASE from site import USER_SITE HAS_USER_SITE = True @@ -61,11 +61,11 @@ index 67db007..b46b45b 100644 'headers': '$base/include/python$py_version_short$abiflags/$dist_name', 'scripts': '$base/bin', 'data' : '$base', -diff --git a/Lib/pydoc.py b/Lib/pydoc.py -index 3ca08c9..6528730 100755 ---- a/Lib/pydoc.py -+++ b/Lib/pydoc.py -@@ -384,7 +384,7 @@ class Doc: +Index: Python-3.5.4/Lib/pydoc.py +=================================================================== +--- Python-3.5.4.orig/Lib/pydoc.py ++++ Python-3.5.4/Lib/pydoc.py +@@ -389,7 +389,7 @@ class Doc: docmodule = docclass = docroutine = docother = docproperty = docdata = fail def getdocloc(self, object, @@ -74,10 +74,10 @@ index 3ca08c9..6528730 100755 "python%d.%d" % sys.version_info[:2])): """Return the location of module docs or None""" -diff --git a/Lib/site.py b/Lib/site.py -index 3f78ef5..511931e 100644 ---- a/Lib/site.py -+++ b/Lib/site.py +Index: Python-3.5.4/Lib/site.py +=================================================================== +--- Python-3.5.4.orig/Lib/site.py ++++ Python-3.5.4/Lib/site.py @@ -303,12 +303,12 @@ def getsitepackages(prefixes=None): seen.add(prefix) @@ -93,10 +93,10 @@ index 3f78ef5..511931e 100644 if sys.platform == "darwin": # for framework builds *only* we add the standard Apple # locations. -diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py -index 9c34be0..3d1181a 100644 ---- a/Lib/sysconfig.py -+++ b/Lib/sysconfig.py +Index: Python-3.5.4/Lib/sysconfig.py +=================================================================== +--- Python-3.5.4.orig/Lib/sysconfig.py ++++ Python-3.5.4/Lib/sysconfig.py @@ -20,10 +20,10 @@ __all__ = [ _INSTALL_SCHEMES = { @@ -139,10 +139,10 @@ index 9c34be0..3d1181a 100644 'include': '{userbase}/include/python{py_version_short}', 'scripts': '{userbase}/bin', 'data': '{userbase}', -diff --git a/Lib/trace.py b/Lib/trace.py -index f108266..7fd83f2 100755 ---- a/Lib/trace.py -+++ b/Lib/trace.py +Index: Python-3.5.4/Lib/trace.py +=================================================================== +--- Python-3.5.4.orig/Lib/trace.py ++++ Python-3.5.4/Lib/trace.py @@ -749,10 +749,10 @@ def main(argv=None): # should I also call expanduser? (after all, could use $HOME) @@ -156,11 +156,11 @@ index f108266..7fd83f2 100755 "python" + sys.version[:3])) s = os.path.normpath(s) ignore_dirs.append(s) -diff --git a/Makefile.pre.in b/Makefile.pre.in -index 109f402..61a41e2 100644 ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -106,6 +106,8 @@ PY_CORE_CFLAGS= $(PY_CFLAGS) $(PY_CFLAGS_NODIST) $(PY_CPPFLAGS) $(CFLAGSFORSHARE +Index: Python-3.5.4/Makefile.pre.in +=================================================================== +--- Python-3.5.4.orig/Makefile.pre.in ++++ Python-3.5.4/Makefile.pre.in +@@ -109,6 +109,8 @@ CFLAGS_ALIASING=@CFLAGS_ALIASING@ # Machine-dependent subdirectories MACHDEP= @MACHDEP@ @@ -169,7 +169,7 @@ index 109f402..61a41e2 100644 # Multiarch directory (may be empty) MULTIARCH= @MULTIARCH@ -@@ -125,7 +127,7 @@ LIBDIR= @libdir@ +@@ -128,7 +130,7 @@ LIBDIR= @libdir@ MANDIR= @mandir@ INCLUDEDIR= @includedir@ CONFINCLUDEDIR= $(exec_prefix)/include @@ -178,7 +178,7 @@ index 109f402..61a41e2 100644 ABIFLAGS= @ABIFLAGS@ # Detailed destination directories -@@ -755,6 +757,7 @@ Modules/getpath.o: $(srcdir)/Modules/getpath.c Makefile +@@ -731,6 +733,7 @@ Modules/getpath.o: $(srcdir)/Modules/get -DEXEC_PREFIX='"$(exec_prefix)"' \ -DVERSION='"$(VERSION)"' \ -DVPATH='"$(VPATH)"' \ @@ -186,8 +186,8 @@ index 109f402..61a41e2 100644 -o $@ $(srcdir)/Modules/getpath.c Programs/python.o: $(srcdir)/Programs/python.c -@@ -835,7 +838,7 @@ $(OPCODE_H): $(srcdir)/Lib/opcode.py $(OPCODE_H_SCRIPT) - Python/compile.o Python/symtable.o Python/ast.o: $(GRAMMAR_H) $(AST_H) +@@ -813,7 +816,7 @@ regen-opcode: + 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_CORE_CFLAGS) -DPLATFORM='"$(MACHDEP)"' -o $@ $(srcdir)/Python/getplatform.c @@ -195,10 +195,10 @@ index 109f402..61a41e2 100644 Python/importdl.o: $(srcdir)/Python/importdl.c $(CC) -c $(PY_CORE_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c -diff --git a/Modules/getpath.c b/Modules/getpath.c -index 18deb60..a01c3f8 100644 ---- a/Modules/getpath.c -+++ b/Modules/getpath.c +Index: Python-3.5.4/Modules/getpath.c +=================================================================== +--- Python-3.5.4.orig/Modules/getpath.c ++++ Python-3.5.4/Modules/getpath.c @@ -105,6 +105,13 @@ #error "PREFIX, EXEC_PREFIX, VERSION, and VPATH must be constant defined" #endif @@ -230,10 +230,10 @@ index 18deb60..a01c3f8 100644 if (!_pythonpath || !_prefix || !_exec_prefix || !lib_python) { Py_FatalError( -diff --git a/Python/getplatform.c b/Python/getplatform.c -index 6899140..66a49c6 100644 ---- a/Python/getplatform.c -+++ b/Python/getplatform.c +Index: Python-3.5.4/Python/getplatform.c +=================================================================== +--- Python-3.5.4.orig/Python/getplatform.c ++++ Python-3.5.4/Python/getplatform.c @@ -10,3 +10,23 @@ Py_GetPlatform(void) { return PLATFORM; @@ -258,11 +258,11 @@ index 6899140..66a49c6 100644 +{ + return LIB; +} -diff --git a/Python/sysmodule.c b/Python/sysmodule.c -index 8d7e05a..d9dee0f 100644 ---- a/Python/sysmodule.c -+++ b/Python/sysmodule.c -@@ -1790,6 +1790,10 @@ _PySys_Init(void) +Index: Python-3.5.4/Python/sysmodule.c +=================================================================== +--- Python-3.5.4.orig/Python/sysmodule.c ++++ Python-3.5.4/Python/sysmodule.c +@@ -1827,6 +1827,10 @@ _PySys_Init(void) PyUnicode_FromString(Py_GetCopyright())); SET_SYS_FROM_STRING("platform", PyUnicode_FromString(Py_GetPlatform())); @@ -273,11 +273,11 @@ index 8d7e05a..d9dee0f 100644 SET_SYS_FROM_STRING("executable", PyUnicode_FromWideChar( Py_GetProgramFullPath(), -1)); -diff --git a/configure.ac b/configure.ac -index 707324d..e8d59a3 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -883,6 +883,41 @@ PLATDIR=plat-$MACHDEP +Index: Python-3.5.4/configure.ac +=================================================================== +--- Python-3.5.4.orig/configure.ac ++++ Python-3.5.4/configure.ac +@@ -885,6 +885,41 @@ PLATDIR=plat-$MACHDEP AC_SUBST(PLATDIR) AC_SUBST(PLATFORM_TRIPLET) @@ -319,11 +319,11 @@ index 707324d..e8d59a3 100644 AC_MSG_CHECKING([for -Wl,--no-as-needed]) save_LDFLAGS="$LDFLAGS" -diff --git a/setup.py b/setup.py -index 6d26deb..7b14215 100644 ---- a/setup.py -+++ b/setup.py -@@ -495,7 +495,7 @@ class PyBuildExt(build_ext): +Index: Python-3.5.4/setup.py +=================================================================== +--- Python-3.5.4.orig/setup.py ++++ Python-3.5.4/setup.py +@@ -494,7 +494,7 @@ class PyBuildExt(build_ext): # directories (i.e. '.' and 'Include') must be first. See issue # 10520. if not cross_compiling: @@ -332,7 +332,7 @@ index 6d26deb..7b14215 100644 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: -@@ -553,8 +553,7 @@ class PyBuildExt(build_ext): +@@ -552,8 +552,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 + [ @@ -342,7 +342,7 @@ index 6d26deb..7b14215 100644 ] inc_dirs = self.compiler.include_dirs + ['/usr/include'] else: -@@ -746,11 +745,11 @@ class PyBuildExt(build_ext): +@@ -745,11 +744,11 @@ class PyBuildExt(build_ext): elif curses_library: readline_libs.append(curses_library) elif self.compiler.find_library_file(lib_dirs + @@ -356,6 +356,3 @@ index 6d26deb..7b14215 100644 extra_link_args=readline_extra_link_args, libraries=readline_libs) ) else: --- -2.11.0 - diff --git a/meta/recipes-devtools/python/python3/python3-use-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch b/meta/recipes-devtools/python/python3/python3-use-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch index 211f9e7889..a4f8bd4710 100644 --- a/meta/recipes-devtools/python/python3/python3-use-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch +++ b/meta/recipes-devtools/python/python3/python3-use-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch @@ -10,16 +10,16 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com> configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: Python-3.5.3/configure.ac +Index: Python-3.5.4/configure.ac =================================================================== ---- Python-3.5.3.orig/configure.ac -+++ Python-3.5.3/configure.ac -@@ -78,7 +78,7 @@ if test "$cross_compiling" = yes; then +--- Python-3.5.4.orig/configure.ac ++++ Python-3.5.4/configure.ac +@@ -73,7 +73,7 @@ if test "$cross_compiling" = yes; then AC_MSG_ERROR([python$PACKAGE_VERSION interpreter not found]) fi AC_MSG_RESULT($interp) - PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib:$(srcdir)/Lib/$(PLATDIR) '$interp + PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(CROSSPYTHONPATH) '$interp fi - # Used to comment out stuff for rebuilding generated files - GENERATED_COMMENT='#' + elif test "$cross_compiling" = maybe; then + AC_MSG_ERROR([Cross compiling required --host=HOST-TUPLE and --build=ARCH]) |