diff options
author | Ross Burton <ross.burton@intel.com> | 2018-03-09 20:55:51 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-03-11 06:25:21 -0700 |
commit | 8a5c1328c4ea63443a92813c54bd2229c9959ff9 (patch) | |
tree | 3af5c1c406009a4964e0e8039b7b66eae9cf58a5 /meta/recipes-devtools/python/python | |
parent | ca733ba0e28d6d4c199e149ce8ae428397dfa51f (diff) | |
download | openembedded-core-contrib-8a5c1328c4ea63443a92813c54bd2229c9959ff9.tar.gz |
python: refresh patches
The patch tool will apply patches by default with "fuzz", which is where if the
hunk context isn't present but what is there is close enough, it will force the
patch in.
Whilst this is useful when there's just whitespace changes, when applied to
source it is possible for a patch applied with fuzz to produce broken code which
still compiles (see #10450). This is obviously bad.
We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For
that to be realistic the existing patches with fuzz need to be rebased and
reviewed.
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-devtools/python/python')
3 files changed, 62 insertions, 61 deletions
diff --git a/meta/recipes-devtools/python/python/add-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch b/meta/recipes-devtools/python/python/add-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch index 506debaf76..329734064b 100644 --- a/meta/recipes-devtools/python/python/add-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch +++ b/meta/recipes-devtools/python/python/add-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch @@ -13,16 +13,16 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com> configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: Python-2.7.13/configure.ac +Index: Python-2.7.14/configure.ac =================================================================== ---- Python-2.7.13.orig/configure.ac -+++ Python-2.7.13/configure.ac -@@ -33,7 +33,7 @@ if test "$cross_compiling" = yes; then +--- Python-2.7.14.orig/configure.ac ++++ Python-2.7.14/configure.ac +@@ -36,7 +36,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):$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib:$(srcdir)/Lib/plat-$(MACHDEP) '$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]) diff --git a/meta/recipes-devtools/python/python/fix-makefile-for-ptest.patch b/meta/recipes-devtools/python/python/fix-makefile-for-ptest.patch index 90dcd57c04..60d782cd26 100644 --- a/meta/recipes-devtools/python/python/fix-makefile-for-ptest.patch +++ b/meta/recipes-devtools/python/python/fix-makefile-for-ptest.patch @@ -4,12 +4,13 @@ cross-compiled. Signed-off-by: Tudor Florea <tudor.florea@enea.com> Upstream-Status: Pending --- -diff -ruN a/Makefile.pre.in b/Makefile.pre.in ---- a/Makefile.pre.in 2013-06-27 10:44:11.033840532 +0200 -+++ b/Makefile.pre.in 2013-06-27 10:44:39.572635273 +0200 -@@ -709,14 +709,19 @@ - # generated bytecode. This is sometimes a very shy bug needing a lot of - # sample data. +Index: Python-2.7.14/Makefile.pre.in +=================================================================== +--- Python-2.7.14.orig/Makefile.pre.in ++++ Python-2.7.14/Makefile.pre.in +@@ -846,14 +846,19 @@ $(LIBRARY_OBJS) $(MODOBJS) Modules/pytho + + .PHONY: test testall testuniversal buildbottest pythoninfo -TESTOPTS= -l $(EXTRATESTOPTS) +TESTOPTS= -l -v $(EXTRATESTOPTS) diff --git a/meta/recipes-devtools/python/python/multilib.patch b/meta/recipes-devtools/python/python/multilib.patch index 94fdfeb630..1116dd518e 100644 --- a/meta/recipes-devtools/python/python/multilib.patch +++ b/meta/recipes-devtools/python/python/multilib.patch @@ -1,11 +1,11 @@ Rebased for python-2.7.9 Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com> Upstream-Status: Pending -Index: Python-2.7.13/configure.ac +Index: Python-2.7.14/configure.ac =================================================================== ---- Python-2.7.13.orig/configure.ac -+++ Python-2.7.13/configure.ac -@@ -759,6 +759,10 @@ SunOS*) +--- Python-2.7.14.orig/configure.ac ++++ Python-2.7.14/configure.ac +@@ -758,6 +758,10 @@ SunOS*) ;; esac @@ -16,10 +16,10 @@ Index: Python-2.7.13/configure.ac AC_SUBST(LIBRARY) AC_MSG_CHECKING(LIBRARY) -Index: Python-2.7.13/Include/pythonrun.h +Index: Python-2.7.14/Include/pythonrun.h =================================================================== ---- Python-2.7.13.orig/Include/pythonrun.h -+++ Python-2.7.13/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); @@ -28,10 +28,10 @@ Index: Python-2.7.13/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.7.13/Lib/distutils/command/install.py +Index: Python-2.7.14/Lib/distutils/command/install.py =================================================================== ---- Python-2.7.13.orig/Lib/distutils/command/install.py -+++ Python-2.7.13/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 @@ -52,10 +52,10 @@ Index: Python-2.7.13/Lib/distutils/command/install.py 'headers': '$base/include/python$py_version_short/$dist_name', 'scripts': '$base/bin', 'data' : '$base', -Index: Python-2.7.13/Lib/distutils/sysconfig.py +Index: Python-2.7.14/Lib/distutils/sysconfig.py =================================================================== ---- Python-2.7.13.orig/Lib/distutils/sysconfig.py -+++ Python-2.7.13/Lib/distutils/sysconfig.py +--- Python-2.7.14.orig/Lib/distutils/sysconfig.py ++++ Python-2.7.14/Lib/distutils/sysconfig.py @@ -119,8 +119,11 @@ def get_python_lib(plat_specific=0, stan prefix = plat_specific and EXEC_PREFIX or PREFIX @@ -70,10 +70,10 @@ Index: Python-2.7.13/Lib/distutils/sysconfig.py if standard_lib: return libpython else: -Index: Python-2.7.13/Lib/pydoc.py +Index: Python-2.7.14/Lib/pydoc.py =================================================================== ---- Python-2.7.13.orig/Lib/pydoc.py -+++ Python-2.7.13/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 @@ -83,10 +83,10 @@ Index: Python-2.7.13/Lib/pydoc.py "python"+sys.version[0:3])): """Return the location of module docs or None""" -Index: Python-2.7.13/Lib/site.py +Index: Python-2.7.14/Lib/site.py =================================================================== ---- Python-2.7.13.orig/Lib/site.py -+++ Python-2.7.13/Lib/site.py +--- Python-2.7.14.orig/Lib/site.py ++++ Python-2.7.14/Lib/site.py @@ -288,13 +288,18 @@ def getsitepackages(): if sys.platform in ('os2emx', 'riscos'): sitepackages.append(os.path.join(prefix, "Lib", "site-packages")) @@ -109,10 +109,10 @@ Index: Python-2.7.13/Lib/site.py return sitepackages def addsitepackages(known_paths): -Index: Python-2.7.13/Lib/sysconfig.py +Index: Python-2.7.14/Lib/sysconfig.py =================================================================== ---- Python-2.7.13.orig/Lib/sysconfig.py -+++ Python-2.7.13/Lib/sysconfig.py +--- Python-2.7.14.orig/Lib/sysconfig.py ++++ Python-2.7.14/Lib/sysconfig.py @@ -7,10 +7,10 @@ from os.path import pardir, realpath _INSTALL_SCHEMES = { @@ -141,10 +141,10 @@ Index: Python-2.7.13/Lib/sysconfig.py 'include': '{userbase}/include/python{py_version_short}', 'scripts': '{userbase}/bin', 'data' : '{userbase}', -Index: Python-2.7.13/Lib/test/test_dl.py +Index: Python-2.7.14/Lib/test/test_dl.py =================================================================== ---- Python-2.7.13.orig/Lib/test/test_dl.py -+++ Python-2.7.13/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 @@ -159,11 +159,11 @@ Index: Python-2.7.13/Lib/test/test_dl.py ('/usr/bin/cygwin1.dll', 'getpid'), ('/usr/lib/libc.dylib', 'getpid'), ] -Index: Python-2.7.13/Lib/test/test_site.py +Index: Python-2.7.14/Lib/test/test_site.py =================================================================== ---- Python-2.7.13.orig/Lib/test/test_site.py -+++ Python-2.7.13/Lib/test/test_site.py -@@ -235,12 +235,16 @@ class HelperFunctionsTests(unittest.Test +--- Python-2.7.14.orig/Lib/test/test_site.py ++++ Python-2.7.14/Lib/test/test_site.py +@@ -252,12 +252,16 @@ class HelperFunctionsTests(unittest.Test self.assertEqual(dirs[0], wanted) elif os.sep == '/': # OS X, Linux, FreeBSD, etc @@ -183,10 +183,10 @@ Index: Python-2.7.13/Lib/test/test_site.py else: # other platforms self.assertEqual(len(dirs), 2) -Index: Python-2.7.13/Lib/trace.py +Index: Python-2.7.14/Lib/trace.py =================================================================== ---- Python-2.7.13.orig/Lib/trace.py -+++ Python-2.7.13/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) @@ -200,11 +200,11 @@ Index: Python-2.7.13/Lib/trace.py "python" + sys.version[:3])) s = os.path.normpath(s) ignore_dirs.append(s) -Index: Python-2.7.13/Makefile.pre.in +Index: Python-2.7.14/Makefile.pre.in =================================================================== ---- Python-2.7.13.orig/Makefile.pre.in -+++ Python-2.7.13/Makefile.pre.in -@@ -92,6 +92,7 @@ PY_CFLAGS= $(CFLAGS) $(CPPFLAGS) $(CFLAG +--- 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@ @@ -212,7 +212,7 @@ Index: Python-2.7.13/Makefile.pre.in # Multiarch directory (may be empty) MULTIARCH= @MULTIARCH@ -@@ -111,7 +112,7 @@ LIBDIR= @libdir@ +@@ -110,7 +111,7 @@ LIBDIR= @libdir@ MANDIR= @mandir@ INCLUDEDIR= @includedir@ CONFINCLUDEDIR= $(exec_prefix)/include @@ -221,7 +221,7 @@ Index: Python-2.7.13/Makefile.pre.in # Detailed destination directories BINLIBDEST= $(LIBDIR)/python$(VERSION) -@@ -669,6 +670,7 @@ Modules/getpath.o: $(srcdir)/Modules/get +@@ -645,6 +646,7 @@ Modules/getpath.o: $(srcdir)/Modules/get -DEXEC_PREFIX='"$(exec_prefix)"' \ -DVERSION='"$(VERSION)"' \ -DVPATH='"$(VPATH)"' \ @@ -229,8 +229,8 @@ Index: Python-2.7.13/Makefile.pre.in -o $@ $(srcdir)/Modules/getpath.c Modules/python.o: $(srcdir)/Modules/python.c -@@ -709,7 +711,7 @@ $(AST_C): $(AST_ASDL) $(ASDLGEN_FILES) - Python/compile.o Python/symtable.o Python/ast.o: $(GRAMMAR_H) $(AST_H) +@@ -693,7 +695,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 @@ -238,10 +238,10 @@ Index: Python-2.7.13/Makefile.pre.in Python/importdl.o: $(srcdir)/Python/importdl.c $(CC) -c $(PY_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c -Index: Python-2.7.13/Modules/getpath.c +Index: Python-2.7.14/Modules/getpath.c =================================================================== ---- Python-2.7.13.orig/Modules/getpath.c -+++ Python-2.7.13/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 @@ -265,10 +265,10 @@ Index: Python-2.7.13/Modules/getpath.c static void reduce(char *dir) -Index: Python-2.7.13/Python/getplatform.c +Index: Python-2.7.14/Python/getplatform.c =================================================================== ---- Python-2.7.13.orig/Python/getplatform.c -+++ Python-2.7.13/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; @@ -283,10 +283,10 @@ Index: Python-2.7.13/Python/getplatform.c +{ + return LIB; +} -Index: Python-2.7.13/Python/sysmodule.c +Index: Python-2.7.14/Python/sysmodule.c =================================================================== ---- Python-2.7.13.orig/Python/sysmodule.c -+++ Python-2.7.13/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", |