diff options
Diffstat (limited to 'meta/recipes-devtools/python/python')
27 files changed, 0 insertions, 1318 deletions
diff --git a/meta/recipes-devtools/python/python/0001-distutils-set-the-prefix-to-be-inside-staging-direct.patch b/meta/recipes-devtools/python/python/0001-distutils-set-the-prefix-to-be-inside-staging-direct.patch deleted file mode 100644 index 502f849804..0000000000 --- a/meta/recipes-devtools/python/python/0001-distutils-set-the-prefix-to-be-inside-staging-direct.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 4cdf2e9df13c6327fcc94d53e4953005543aef3d Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Wed, 6 Apr 2016 17:43:02 +0300 -Subject: [PATCH 01/10] distutils: set the prefix to be inside staging - directory - -The proper prefix is inside our staging area. - -Upstream-Status: Inappropriate [embedded specific] -Signed-off-by: Michael 'Mickey' Lauer <mickey@vanille-media.de> -Signed-off-by: Phil Blundell <philb@gnu.org> -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - Lib/distutils/sysconfig.py | 10 +++++++--- - 1 file changed, 7 insertions(+), 3 deletions(-) - -diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py -index de7da1d..f3aacf7 100644 ---- a/Lib/distutils/sysconfig.py -+++ b/Lib/distutils/sysconfig.py -@@ -75,7 +75,7 @@ def get_python_inc(plat_specific=0, prefix=None): - sys.exec_prefix -- i.e., ignore 'plat_specific'. - """ - if prefix is None: -- prefix = plat_specific and EXEC_PREFIX or PREFIX -+ prefix = os.environ['STAGING_INCDIR'].rstrip('include') - - if os.name == "posix": - if python_build: -@@ -115,12 +115,16 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None): - If 'prefix' is supplied, use it instead of sys.prefix or - sys.exec_prefix -- i.e., ignore 'plat_specific'. - """ -+ lib_basename = os.environ['STAGING_LIBDIR'].split('/')[-1] - if prefix is None: -- prefix = plat_specific and EXEC_PREFIX or PREFIX -+ if plat_specific: -+ prefix = os.environ['STAGING_LIBDIR'].rstrip(lib_basename) -+ else: -+ prefix = PREFIX - - if os.name == "posix": - libpython = os.path.join(prefix, -- "lib", "python" + get_python_version()) -+ lib_basename, "python" + get_python_version()) - if standard_lib: - return libpython - else: --- -2.8.0.rc3 - diff --git a/meta/recipes-devtools/python/python/01-use-proper-tools-for-cross-build.patch b/meta/recipes-devtools/python/python/01-use-proper-tools-for-cross-build.patch deleted file mode 100644 index 366ce3e400..0000000000 --- a/meta/recipes-devtools/python/python/01-use-proper-tools-for-cross-build.patch +++ /dev/null @@ -1,97 +0,0 @@ -We need to ensure our host tools get run during build, not the freshly -built cross-tools (this will not work), so we introduce HOSTPYTHON and HOSTPGEN. - -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: Michael 'Mickey' Lauer <mickey@vanille-media.de> -Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> - -Rebased for python-2.7.9 -Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com> - -Index: Python-2.7.13/Makefile.pre.in -=================================================================== ---- Python-2.7.13.orig/Makefile.pre.in -+++ Python-2.7.13/Makefile.pre.in -@@ -245,6 +245,7 @@ LIBFFI_INCLUDEDIR= @LIBFFI_INCLUDEDIR@ - ########################################################################## - # Parser - PGEN= Parser/pgen$(EXE) -+HOSTPGEN= $(PGEN)$(EXE) - - PSRCS= \ - Parser/acceler.c \ -@@ -512,7 +513,7 @@ $(BUILDPYTHON): Modules/python.o $(LIBRA - $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) - - platform: $(BUILDPYTHON) pybuilddir.txt -- $(RUNSHARED) $(PYTHON_FOR_BUILD) -c 'import sys ; from sysconfig import get_platform ; print get_platform()+"-"+sys.version[0:3]' >platform -+ $(RUNSHARED) $(PYTHON_FOR_BUILD) -c 'import sys ; from distutils.util import get_platform ; print get_platform()+"-"+sys.version[0:3]' >platform - - # Create build directory and generate the sysconfig build-time data there. - # pybuilddir.txt contains the name of the build dir and is used for -@@ -681,7 +682,7 @@ Modules/pwdmodule.o: $(srcdir)/Modules/p - - $(GRAMMAR_H): @GENERATED_COMMENT@ $(GRAMMAR_INPUT) $(PGEN) - @$(MKDIR_P) Include -- $(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) -+ $(HOSTPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) - $(GRAMMAR_C): @GENERATED_COMMENT@ $(GRAMMAR_H) - touch $(GRAMMAR_C) - -@@ -1121,27 +1122,27 @@ libinstall: build_all $(srcdir)/Lib/$(PL - $(DESTDIR)$(LIBDEST)/distutils/tests ; \ - fi - PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -- $(PYTHON_FOR_BUILD) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ -+ $(HOSTPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST) -f \ - -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ - $(DESTDIR)$(LIBDEST) - PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -- $(PYTHON_FOR_BUILD) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \ -+ $(HOSTPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST) -f \ - -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ - $(DESTDIR)$(LIBDEST) - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -- $(PYTHON_FOR_BUILD) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \ -+ $(HOSTPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST)/site-packages -f \ - -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -- $(PYTHON_FOR_BUILD) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \ -+ $(HOSTPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST)/site-packages -f \ - -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -- $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt -+ $(HOSTPYTHON) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -- $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/PatternGrammar.txt -+ $(HOSTPYTHON) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/PatternGrammar.txt - - # Create the PLATDIR source directory, if one wasn't distributed.. - $(srcdir)/Lib/$(PLATDIR): -Index: Python-2.7.13/setup.py -=================================================================== ---- Python-2.7.13.orig/setup.py -+++ Python-2.7.13/setup.py -@@ -350,6 +350,7 @@ class PyBuildExt(build_ext): - self.failed.append(ext.name) - self.announce('*** WARNING: renaming "%s" since importing it' - ' failed: %s' % (ext.name, why), level=3) -+ return - assert not self.inplace - basename, tail = os.path.splitext(ext_filename) - newname = basename + "_failed" + tail -@@ -574,6 +575,9 @@ class PyBuildExt(build_ext): - - # XXX Omitted modules: gl, pure, dl, SGI-specific modules - -+ lib_dirs = [ os.getenv("STAGING_LIBDIR"), os.getenv("STAGING_BASELIBDIR") ] -+ inc_dirs = [ os.getenv("STAGING_INCDIR") ] -+ - # - # The following modules are all pretty straightforward, and compile - # on pretty much any POSIXish platform. diff --git a/meta/recipes-devtools/python/python/03-fix-tkinter-detection.patch b/meta/recipes-devtools/python/python/03-fix-tkinter-detection.patch deleted file mode 100644 index 650ceb5951..0000000000 --- a/meta/recipes-devtools/python/python/03-fix-tkinter-detection.patch +++ /dev/null @@ -1,46 +0,0 @@ -Upstream-Status: Inappropriate [embedded specific] - -We need to supply STAGING_INCDIR here, otherwise the Tk headers -will not be found. - -Signed-off-by: Michael 'Mickey' Lauer <mickey@vanille.de> -Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> - -Rebased for python-2.7.9 - -diff --git a/setup.py b/setup.py -index 8fe1fb8..67eda74 100644 ---- a/setup.py -+++ b/setup.py -@@ -1892,7 +1892,7 @@ class PyBuildExt(build_ext): - dotversion = dotversion[:-1] + '.' + dotversion[-1] - tcl_include_sub = [] - tk_include_sub = [] -- for dir in inc_dirs: -+ for dir in [os.getenv("STAGING_INCDIR")]: - tcl_include_sub += [dir + os.sep + "tcl" + dotversion] - tk_include_sub += [dir + os.sep + "tk" + dotversion] - tk_include_sub += tcl_include_sub -@@ -1911,22 +1911,6 @@ class PyBuildExt(build_ext): - if dir not in include_dirs: - include_dirs.append(dir) - -- # Check for various platform-specific directories -- if host_platform == 'sunos5': -- include_dirs.append('/usr/openwin/include') -- added_lib_dirs.append('/usr/openwin/lib') -- elif os.path.exists('/usr/X11R6/include'): -- include_dirs.append('/usr/X11R6/include') -- added_lib_dirs.append('/usr/X11R6/lib64') -- added_lib_dirs.append('/usr/X11R6/lib') -- elif os.path.exists('/usr/X11R5/include'): -- include_dirs.append('/usr/X11R5/include') -- added_lib_dirs.append('/usr/X11R5/lib') -- else: -- # Assume default location for X11 -- include_dirs.append('/usr/X11/include') -- added_lib_dirs.append('/usr/X11/lib') -- - # If Cygwin, then verify that X is installed before proceeding - if host_platform == 'cygwin': - x11_inc = find_file('X11/Xlib.h', [], include_dirs) diff --git a/meta/recipes-devtools/python/python/05-enable-ctypes-cross-build.patch b/meta/recipes-devtools/python/python/05-enable-ctypes-cross-build.patch deleted file mode 100644 index 5cc8742462..0000000000 --- a/meta/recipes-devtools/python/python/05-enable-ctypes-cross-build.patch +++ /dev/null @@ -1,27 +0,0 @@ -Rebased for python 2.7.9 - -Upstream-Status: Inappropriate [embedded specific] - -# CTypes need to know the actual host we are building on. -# Signed-Off: Michael Dietrich <mdt@emdete.de> - -Index: Python-2.7.9/setup.py -=================================================================== ---- Python-2.7.9.orig/setup.py -+++ Python-2.7.9/setup.py -@@ -2028,12 +2028,12 @@ class PyBuildExt(build_ext): - - # Pass empty CFLAGS because we'll just append the resulting - # CFLAGS to Python's; -g or -O2 is to be avoided. -- cmd = "cd %s && env CFLAGS='' '%s/configure' %s" \ -- % (ffi_builddir, ffi_srcdir, " ".join(config_args)) -+ cmd = "(cd %s && autoconf -W cross) && (cd %s && env CFLAGS='' '%s/configure' %s)" \ -+ % (ffi_srcdir, ffi_builddir, ffi_srcdir, " ".join(config_args)) - - res = os.system(cmd) - if res or not os.path.exists(ffi_configfile): -- print "Failed to configure _ctypes module" -+ print "Failed to configure _ctypes module (res=%d) or missing conffile=%s" % ( res, ffi_configfile ) - return False - - fficonfig = {} diff --git a/meta/recipes-devtools/python/python/06-avoid_usr_lib_termcap_path_in_linking.patch b/meta/recipes-devtools/python/python/06-avoid_usr_lib_termcap_path_in_linking.patch deleted file mode 100644 index 435b319013..0000000000 --- a/meta/recipes-devtools/python/python/06-avoid_usr_lib_termcap_path_in_linking.patch +++ /dev/null @@ -1,35 +0,0 @@ -Upstream-Status: Pending - -The poison directories patch has detected library path issue while -compiling the python in cross environment, as seen bellow. - -warning: library search path "/usr/lib/termcap" is unsafe for cross-compilation - -This Patch fixes this issue in the python build environment. -11 Oct 2010 -Nitin A Kamble <nitin.a.kamble@intel.com> - -2011/09/29 -Rebased for python 2.7.2 -Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> - -Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> - -diff --git a/setup.py b/setup.py -index 67eda74..59c537e 100644 ---- a/setup.py -+++ b/setup.py -@@ -761,12 +761,10 @@ class PyBuildExt(build_ext): - pass # Issue 7384: Already linked against curses or tinfo. - elif curses_library: - readline_libs.append(curses_library) -- elif self.compiler.find_library_file(lib_dirs + -- ['/usr/lib/termcap'], -+ elif self.compiler.find_library_file(lib_dirs, - 'termcap'): - readline_libs.append('termcap') - exts.append( Extension('readline', ['readline.c'], -- library_dirs=['/usr/lib/termcap'], - extra_link_args=readline_extra_link_args, - libraries=readline_libs) ) - else: diff --git a/meta/recipes-devtools/python/python/Don-t-use-getentropy-on-Linux.patch b/meta/recipes-devtools/python/python/Don-t-use-getentropy-on-Linux.patch deleted file mode 100644 index 38e53778dc..0000000000 --- a/meta/recipes-devtools/python/python/Don-t-use-getentropy-on-Linux.patch +++ /dev/null @@ -1,41 +0,0 @@ -Upstream-Status: Backport - -Signed-off-by: Andreas Oberritter <obi@opendreambox.org> - -From 905d1b30ac7cb0e31c57cec0533825c8f170b942 Mon Sep 17 00:00:00 2001 -From: Victor Stinner <victor.stinner@gmail.com> -Date: Mon, 9 Jan 2017 11:10:41 +0100 -Subject: [PATCH] Don't use getentropy() on Linux - -Issue #29188: Support glibc 2.24 on Linux: don't use getentropy() function but -read from /dev/urandom to get random bytes, for example in os.urandom(). On -Linux, getentropy() is implemented which getrandom() is blocking mode, whereas -os.urandom() should not block. - -(cherry picked from commit 2687486756721e39164fa9f597e468c35d495227) ---- - Python/random.c | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) - -diff --git a/Python/random.c b/Python/random.c -index b4bc1f3..f3f5d14 100644 ---- a/Python/random.c -+++ b/Python/random.c -@@ -94,8 +94,15 @@ win32_urandom(unsigned char *buffer, Py_ssize_t size, int raise) - } - - /* Issue #25003: Don't use getentropy() on Solaris (available since -- * Solaris 11.3), it is blocking whereas os.urandom() should not block. */ --#elif defined(HAVE_GETENTROPY) && !defined(sun) -+ Solaris 11.3), it is blocking whereas os.urandom() should not block. -+ -+ Issue #29188: Don't use getentropy() on Linux since the glibc 2.24 -+ implements it with the getrandom() syscall which can fail with ENOSYS, -+ and this error is not supported in py_getentropy() and getrandom() is called -+ with flags=0 which blocks until system urandom is initialized, which is not -+ the desired behaviour to seed the Python hash secret nor for os.urandom(): -+ see the PEP 524 which was only implemented in Python 3.6. */ -+#elif defined(HAVE_GETENTROPY) && !defined(sun) && !defined(linux) - #define PY_GETENTROPY 1 - - /* Fill buffer with size pseudo-random bytes generated by getentropy(). 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 deleted file mode 100644 index a97ff6b250..0000000000 --- a/meta/recipes-devtools/python/python/add-CROSSPYTHONPATH-for-PYTHON_FOR_BUILD.patch +++ /dev/null @@ -1,28 +0,0 @@ -configure.ac: add CROSSPYTHONPATH into PYTHONPATH for PYTHON_FOR_BUILD - -When building x86->x86 the system will try to execute .so and related items -from the default PYTHONPATH. This will fail if the target CPU contains -instructions that the host CPU does not have, add CROSSPYTHONPATH -into PYTHONPATH so we can prepend the list to find correct libs. - -Upstream-Status: Inappropriate [OE-Core integration specific] - -Signed-off-by: Mark Hatle <mark.hatle@windriver.com> -Signed-off-by: Jackie Huang <jackie.huang@windriver.com> ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: Python-2.7.11/configure.ac -=================================================================== ---- Python-2.7.11.orig/configure.ac -+++ Python-2.7.11/configure.ac -@@ -33,7 +33,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 - 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/add-md5module-support.patch b/meta/recipes-devtools/python/python/add-md5module-support.patch deleted file mode 100644 index 33fea77554..0000000000 --- a/meta/recipes-devtools/python/python/add-md5module-support.patch +++ /dev/null @@ -1,18 +0,0 @@ - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Saul Wold <sgw@linux.intel.com> - -Index: Python-2.7.2/Modules/Setup.dist -=================================================================== ---- Python-2.7.2.orig/Modules/Setup.dist 2011-06-11 08:46:26.000000000 -0700 -+++ Python-2.7.2/Modules/Setup.dist 2011-12-27 15:51:41.244623219 -0800 -@@ -248,7 +248,7 @@ - # Message-Digest Algorithm, described in RFC 1321. The necessary files - # md5.c and md5.h are included here. - --#_md5 md5module.c md5.c -+_md5 md5module.c md5.c - - - # The _sha module implements the SHA checksum algorithms. diff --git a/meta/recipes-devtools/python/python/avoid_warning_about_tkinter.patch b/meta/recipes-devtools/python/python/avoid_warning_about_tkinter.patch deleted file mode 100644 index 3347321fde..0000000000 --- a/meta/recipes-devtools/python/python/avoid_warning_about_tkinter.patch +++ /dev/null @@ -1,39 +0,0 @@ -_tkinter module needs tk module along with tcl. tk is not yet integrated -in yocto so we skip the check for this module. -Avoid a warning by not adding this module to missing variable. - -Upstream-Status: Inappropriate [distribution] - -Also simply disable the tk module since its not in DEPENDS. -Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> - -Index: Python-2.7.2/setup.py -=================================================================== ---- Python-2.7.2.orig/setup.py 2012-04-05 23:18:38.500136647 +0300 -+++ Python-2.7.2/setup.py 2012-04-05 23:19:35.888134969 +0300 -@@ -1634,8 +1634,10 @@ - # Call the method for detecting whether _tkinter can be compiled - self.detect_tkinter(inc_dirs, lib_dirs) - -- if '_tkinter' not in [e.name for e in self.extensions]: -- missing.append('_tkinter') -+ # tkinter module will not be avalaible as yocto -+ # doesn't have tk integrated (yet) -+ #if '_tkinter' not in [e.name for e in self.extensions]: -+ # missing.append('_tkinter') - - return missing - -diff --git Python-3.5.1.orig/setup.py Python-3.5.1/setup.py -index b4633b9..d7588c0 100644 ---- Python-3.5.1.orig/setup.py -+++ Python-3.5.1/setup.py -@@ -1536,7 +1536,7 @@ class PyBuildExt(build_ext): - self.extensions.extend(exts) - - # Call the method for detecting whether _tkinter can be compiled -- self.detect_tkinter(inc_dirs, lib_dirs) -+ # self.detect_tkinter(inc_dirs, lib_dirs) - - # tkinter module will not be avalaible as yocto - # doesn't have tk integrated (yet) diff --git a/meta/recipes-devtools/python/python/avoid_warning_for_sunos_specific_module.patch b/meta/recipes-devtools/python/python/avoid_warning_for_sunos_specific_module.patch deleted file mode 100644 index 337e0e3e29..0000000000 --- a/meta/recipes-devtools/python/python/avoid_warning_for_sunos_specific_module.patch +++ /dev/null @@ -1,23 +0,0 @@ -sunaudiodev module is sunos specific so we avoid a warning by not -adding this module to missing variable. - -Upstream-Status: Inappropriate [distribution] - -Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> - -Index: Python-2.7.2/setup.py -=================================================================== ---- Python-2.7.2.orig/setup.py 2012-04-05 22:29:18.049196608 +0300 -+++ Python-2.7.2/setup.py 2012-04-05 22:29:57.505195453 +0300 -@@ -1522,8 +1522,9 @@ - if platform == 'sunos5': - # SunOS specific modules - exts.append( Extension('sunaudiodev', ['sunaudiodev.c']) ) -- else: -- missing.append('sunaudiodev') -+ # If platform is not sunos warning is useless -+ #else: -+ # missing.append('sunaudiodev') - - if platform == 'darwin': - # _scproxy diff --git a/meta/recipes-devtools/python/python/builddir.patch b/meta/recipes-devtools/python/python/builddir.patch deleted file mode 100644 index ad629a022e..0000000000 --- a/meta/recipes-devtools/python/python/builddir.patch +++ /dev/null @@ -1,46 +0,0 @@ -When cross compiling python, we used to need to install the Makefile, pyconfig.h -and the python library to their final location before being able to compile the -rest of python. This change allows us to point python at its own source when -building, avoiding a variety of sysroot staging issues and simplifying the main -python recipe. - -Upstream-Status: Inappropriate -RP 2012/11/13 - -Index: Python-2.7.9/Lib/sysconfig.py -=================================================================== ---- Python-2.7.9.orig/Lib/sysconfig.py -+++ Python-2.7.9/Lib/sysconfig.py -@@ -93,6 +93,7 @@ _PREFIX = os.path.normpath(sys.prefix) - _EXEC_PREFIX = os.path.normpath(sys.exec_prefix) - _CONFIG_VARS = None - _USER_BASE = None -+_PYTHONBUILDDIR = os.environ.get("PYTHONBUILDDIR", None) - - def _safe_realpath(path): - try: -@@ -100,7 +101,9 @@ def _safe_realpath(path): - except OSError: - return path - --if sys.executable: -+if _PYTHONBUILDDIR: -+ _PROJECT_BASE = _PYTHONBUILDDIR -+elif sys.executable: - _PROJECT_BASE = os.path.dirname(_safe_realpath(sys.executable)) - else: - # sys.executable can be empty if argv[0] has been changed and Python is -Index: Python-2.7.9/Lib/distutils/sysconfig.py -=================================================================== ---- Python-2.7.9.orig/Lib/distutils/sysconfig.py -+++ Python-2.7.9/Lib/distutils/sysconfig.py -@@ -26,6 +26,9 @@ EXEC_PREFIX = os.path.normpath(sys.exec_ - # live in project/PCBuild9. If we're dealing with an x64 Windows build, - # it'll live in project/PCbuild/amd64. - project_base = os.path.dirname(os.path.abspath(sys.executable)) -+_PYTHONBUILDDIR = os.environ.get("PYTHONBUILDDIR", None) -+if _PYTHONBUILDDIR: -+ project_base = _PYTHONBUILDDIR - if os.name == "nt" and "pcbuild" in project_base[-8:].lower(): - project_base = os.path.abspath(os.path.join(project_base, os.path.pardir)) - # PC/VS7.1 diff --git a/meta/recipes-devtools/python/python/cgi_py.patch b/meta/recipes-devtools/python/python/cgi_py.patch deleted file mode 100644 index de504f9dcf..0000000000 --- a/meta/recipes-devtools/python/python/cgi_py.patch +++ /dev/null @@ -1,23 +0,0 @@ -Lib/cgi.py: Update the script as mentioned in the comment - -Upstream-Status: Inappropriate [distribution] - -Signed-off-by: Mark Hatle <mark.hatle@windriver.com> - ---- Python-2.6.6/Lib/cgi.py.orig 2010-08-01 22:14:27.000000000 -0500 -+++ Python-2.6.6/Lib/cgi.py 2011-09-21 15:28:40.478208631 -0500 -@@ -1,13 +1,4 @@ --#! /usr/local/bin/python -- --# NOTE: the above "/usr/local/bin/python" is NOT a mistake. It is --# intentionally NOT "/usr/bin/env python". On many systems --# (e.g. Solaris), /usr/local/bin is not in $PATH as passed to CGI --# scripts, and /usr/local/bin is the default directory where Python is --# installed, so /usr/bin/env would be unable to find python. Granted, --# binary installations by Linux vendors often install Python in --# /usr/bin. So let those vendors patch cgi.py to match their choice --# of installation. -+#! /usr/bin/env python - - """Support module for CGI (Common Gateway Interface) scripts. - diff --git a/meta/recipes-devtools/python/python/check-if-target-is-64b-not-host.patch b/meta/recipes-devtools/python/python/check-if-target-is-64b-not-host.patch deleted file mode 100644 index e6d6c65bbe..0000000000 --- a/meta/recipes-devtools/python/python/check-if-target-is-64b-not-host.patch +++ /dev/null @@ -1,57 +0,0 @@ -Author: Andrei Gherzan <andrei@gherzan.ro> -Date: Sun Mar 25 02:02:27 2012 +0200 - -This patch was added for 64bit host machines. In the compile process python -is checking if platform is a 64bit platform using sys.maxint which is the host's -value. The patch fixes this issue so that python would check if TARGET machine -is 64bit not the HOST machine. In this way will have "dl" and "imageop" modules -built if HOST machine is 64bit but the target machine is 32bit. - -Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> - -Upstream-Status: Pending - -Index: Python-2.7.11/setup.py -=================================================================== ---- Python-2.7.11.orig/setup.py -+++ Python-2.7.11/setup.py -@@ -35,6 +35,21 @@ COMPILED_WITH_PYDEBUG = ('--with-pydebug - # This global variable is used to hold the list of modules to be disabled. - disabled_module_list = [] - -+def target_is_64bit_platform (): -+ """ -+ In case of cross-compile, some modules are not build as setup checks if HOST -+ is 64bit and not TARGET. -+ As python was built for TARGET we can check this in pyconfig.h in this way: -+ Sizeof LONG on a 32 bit platform is 4 bytes -+ Sizeof LONG on a 64 bit platform is 8 bytes -+ """ -+ pyconf = open("pyconfig.h").read() -+ aux = re.search(r"#s*define\s+SIZEOF_LONG\s+8\s*", pyconf) -+ if aux is not None: -+ return True -+ else: -+ return False -+ - def add_dir_to_list(dirlist, dir): - """Add the directory 'dir' to the list 'dirlist' (at the front) if - 1) 'dir' is not already in 'dirlist' -@@ -716,7 +731,7 @@ class PyBuildExt(build_ext): - exts.append( Extension('audioop', ['audioop.c']) ) - - # Disabled on 64-bit platforms -- if sys.maxsize != 9223372036854775807L: -+ if not target_is_64bit_platform(): - # Operations on images - exts.append( Extension('imageop', ['imageop.c']) ) - else: -@@ -1545,7 +1560,7 @@ class PyBuildExt(build_ext): - missing.append('_codecs_%s' % loc) - - # Dynamic loading module -- if sys.maxint == 0x7fffffff: -+ if not target_is_64bit_platform(): - # This requires sizeof(int) == sizeof(long) == sizeof(char*) - dl_inc = find_file('dlfcn.h', [], inc_dirs) - if (dl_inc is not None) and (host_platform not in ['atheos']): diff --git a/meta/recipes-devtools/python/python/fix-makefile-for-ptest.patch b/meta/recipes-devtools/python/python/fix-makefile-for-ptest.patch deleted file mode 100644 index 669112dab0..0000000000 --- a/meta/recipes-devtools/python/python/fix-makefile-for-ptest.patch +++ /dev/null @@ -1,33 +0,0 @@ -Add 'build-test' and 'runtest-TESTS' targets to Makefile, to build and run tests -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. - --TESTOPTS= -l $(EXTRATESTOPTS) -+TESTOPTS= -l -v $(EXTRATESTOPTS) - TESTPROG= $(srcdir)/Lib/test/regrtest.py --TESTPYTHON= $(RUNSHARED) ./$(BUILDPYTHON) -Wd -3 -E -tt $(TESTPYTHONOPTS) --test: all platform -- -find $(srcdir)/Lib -name '*.py[co]' -print | xargs rm -f -+TESTPYTHON= $(RUNSHARED) $(BUILDPYTHON) -Wd -3 -E -tt $(TESTPYTHONOPTS) -+test: build-test -+ $(MAKE) runtest-TESTS -+ -+runtest-TESTS: -+ -find $(srcdir) -name '*.py[co]' -print | xargs rm -f - -$(TESTPYTHON) $(TESTPROG) $(TESTOPTS) - $(TESTPYTHON) $(TESTPROG) $(TESTOPTS) - -+build-test: all platform -+ - testall: all platform - -find $(srcdir)/Lib -name '*.py[co]' -print | xargs rm -f - $(TESTPYTHON) $(srcdir)/Lib/compileall.py diff --git a/meta/recipes-devtools/python/python/fix_for_using_different_libdir.patch b/meta/recipes-devtools/python/python/fix_for_using_different_libdir.patch deleted file mode 100644 index 5f7309367c..0000000000 --- a/meta/recipes-devtools/python/python/fix_for_using_different_libdir.patch +++ /dev/null @@ -1,77 +0,0 @@ -Upstream-Status: Inappropriate [Embedded specific] - -This patch fixes issuing with different libdir like lib64. -This patch makes the native python binary modules findable -in the install process of the host python. - -Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> -Date: 2012/03/14 - -Updated for python 2.7.3 -Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> -Date: 2012/05/01 - -Rebased for python-2.7.9 -Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com> - - -Index: Python-2.7.9/Lib/sysconfig.py -=================================================================== ---- Python-2.7.9.orig/Lib/sysconfig.py -+++ Python-2.7.9/Lib/sysconfig.py -@@ -9,7 +9,7 @@ _INSTALL_SCHEMES = { - 'posix_prefix': { - 'stdlib': '{base}/'+sys.lib+'/python{py_version_short}', - 'platstdlib': '{platbase}/'+sys.lib+'/python{py_version_short}', -- 'purelib': '{base}/lib/python{py_version_short}/site-packages', -+ 'purelib': '{base}/'+sys.lib+'/python{py_version_short}/site-packages', - 'platlib': '{platbase}/'+sys.lib+'/python{py_version_short}/site-packages', - 'include': '{base}/include/python{py_version_short}', - 'platinclude': '{platbase}/include/python{py_version_short}', -@@ -67,7 +67,7 @@ _INSTALL_SCHEMES = { - 'posix_user': { - 'stdlib': '{userbase}/'+sys.lib+'/python{py_version_short}', - 'platstdlib': '{userbase}/'+sys.lib+'/python{py_version_short}', -- 'purelib': '{userbase}/lib/python{py_version_short}/site-packages', -+ 'purelib': '{userbase}/'+sys.lib+'/python{py_version_short}/site-packages', - 'platlib': '{userbase}/'+sys.lib+'/python{py_version_short}/site-packages', - 'include': '{userbase}/include/python{py_version_short}', - 'scripts': '{userbase}/bin', -Index: Python-2.7.9/Makefile.pre.in -=================================================================== ---- Python-2.7.9.orig/Makefile.pre.in -+++ Python-2.7.9/Makefile.pre.in -@@ -1046,27 +1046,27 @@ libinstall: build_all $(srcdir)/Lib/$(PL - $(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \ - $(DESTDIR)$(LIBDEST)/distutils/tests ; \ - fi -- PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -+ PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \ - $(HOSTPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST) -f \ - -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ - $(DESTDIR)$(LIBDEST) -- PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -+ PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH}$(RUNSHARED) \ - $(HOSTPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST) -f \ - -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ - $(DESTDIR)$(LIBDEST) -- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -+ -PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \ - $(HOSTPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST)/site-packages -f \ - -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages -- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -+ -PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \ - $(HOSTPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST)/site-packages -f \ - -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages -- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -+ -PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \ - $(HOSTPYTHON) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt -- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -+ -PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \ - $(HOSTPYTHON) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/PatternGrammar.txt - - # Create the PLATDIR source directory, if one wasn't distributed.. diff --git a/meta/recipes-devtools/python/python/host_include_contamination.patch b/meta/recipes-devtools/python/python/host_include_contamination.patch deleted file mode 100644 index e0aafb218b..0000000000 --- a/meta/recipes-devtools/python/python/host_include_contamination.patch +++ /dev/null @@ -1,28 +0,0 @@ -when building python for qemux86-64 on ubuntu 11.10/64bit -it gropes into host includes and then mixes them with cross -includes and as a result some modules fail to compile and link -one of the modules is python-elementtree which is then not -found during image creation - -Proble is that setup.py tries to add native includes that newer -ubuntu has introduced for multiarch support. But that should -only happen for native builds and not cross building python -so we add a check here. - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Upstream-Status: Pending - - -diff --git a/setup.py b/setup.py -index ba2d242..bf859be 100644 ---- a/setup.py -+++ b/setup.py -@@ -393,6 +393,8 @@ class PyBuildExt(build_ext): - - if not find_executable('dpkg-architecture'): - return -+ if os.environ.get('CROSS_COMPILE') is not None: -+ return - opt = '' - if cross_compiling: - opt = '-t' + sysconfig.get_config_var('HOST_GNU_TYPE') diff --git a/meta/recipes-devtools/python/python/multilib.patch b/meta/recipes-devtools/python/python/multilib.patch deleted file mode 100644 index f5568d2d2b..0000000000 --- a/meta/recipes-devtools/python/python/multilib.patch +++ /dev/null @@ -1,296 +0,0 @@ -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 -=================================================================== ---- Python-2.7.13.orig/configure.ac -+++ Python-2.7.13/configure.ac -@@ -759,6 +759,10 @@ SunOS*) - ;; - esac - -+AC_SUBST(LIB) -+AC_MSG_CHECKING(LIB) -+LIB=`basename ${libdir}` -+AC_MSG_RESULT($LIB) - - AC_SUBST(LIBRARY) - AC_MSG_CHECKING(LIBRARY) -Index: Python-2.7.13/Include/pythonrun.h -=================================================================== ---- Python-2.7.13.orig/Include/pythonrun.h -+++ Python-2.7.13/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.13/Lib/distutils/command/install.py -=================================================================== ---- Python-2.7.13.orig/Lib/distutils/command/install.py -+++ Python-2.7.13/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.13/Lib/distutils/sysconfig.py -=================================================================== ---- Python-2.7.13.orig/Lib/distutils/sysconfig.py -+++ Python-2.7.13/Lib/distutils/sysconfig.py -@@ -119,8 +119,11 @@ def get_python_lib(plat_specific=0, stan - prefix = plat_specific and EXEC_PREFIX or PREFIX - - if os.name == "posix": -- libpython = os.path.join(prefix, -- "lib", "python" + get_python_version()) -+ if plat_specific or standard_lib: -+ lib = sys.lib -+ else: -+ lib = "lib" -+ libpython = os.path.join(prefix, lib, "python" + get_python_version()) - if standard_lib: - return libpython - else: -Index: Python-2.7.13/Lib/pydoc.py -=================================================================== ---- Python-2.7.13.orig/Lib/pydoc.py -+++ Python-2.7.13/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.13/Lib/site.py -=================================================================== ---- Python-2.7.13.orig/Lib/site.py -+++ Python-2.7.13/Lib/site.py -@@ -288,13 +288,18 @@ 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")) -+ sitepackages.append(os.path.join(prefix, sys.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, "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.13/Lib/sysconfig.py -=================================================================== ---- Python-2.7.13.orig/Lib/sysconfig.py -+++ Python-2.7.13/Lib/sysconfig.py -@@ -7,10 +7,10 @@ from os.path import pardir, realpath - - _INSTALL_SCHEMES = { - 'posix_prefix': { -- 'stdlib': '{base}/lib/python{py_version_short}', -- 'platstdlib': '{platbase}/lib/python{py_version_short}', -+ 'stdlib': '{base}/'+sys.lib+'/python{py_version_short}', -+ 'platstdlib': '{platbase}/'+sys.lib+'/python{py_version_short}', - 'purelib': '{base}/lib/python{py_version_short}/site-packages', -- 'platlib': '{platbase}/lib/python{py_version_short}/site-packages', -+ 'platlib': '{platbase}/'+sys.lib+'/python{py_version_short}/site-packages', - 'include': '{base}/include/python{py_version_short}', - 'platinclude': '{platbase}/include/python{py_version_short}', - 'scripts': '{base}/bin', -@@ -65,10 +65,10 @@ _INSTALL_SCHEMES = { - 'data' : '{userbase}', - }, - 'posix_user': { -- 'stdlib': '{userbase}/lib/python{py_version_short}', -- 'platstdlib': '{userbase}/lib/python{py_version_short}', -+ 'stdlib': '{userbase}/'+sys.lib+'/python{py_version_short}', -+ 'platstdlib': '{userbase}/'+sys.lib+'/python{py_version_short}', - 'purelib': '{userbase}/lib/python{py_version_short}/site-packages', -- 'platlib': '{userbase}/lib/python{py_version_short}/site-packages', -+ 'platlib': '{userbase}/'+sys.lib+'/python{py_version_short}/site-packages', - 'include': '{userbase}/include/python{py_version_short}', - 'scripts': '{userbase}/bin', - 'data' : '{userbase}', -Index: Python-2.7.13/Lib/test/test_dl.py -=================================================================== ---- Python-2.7.13.orig/Lib/test/test_dl.py -+++ Python-2.7.13/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.13/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 - self.assertEqual(dirs[0], wanted) - elif os.sep == '/': - # OS X, Linux, FreeBSD, etc -- self.assertEqual(len(dirs), 2) - wanted = os.path.join('xoxo', 'lib', 'python' + sys.version[:3], - 'site-packages') -- self.assertEqual(dirs[0], wanted) -+ self.assertTrue(wanted in dirs) - wanted = os.path.join('xoxo', 'lib', 'site-python') -- self.assertEqual(dirs[1], wanted) -+ self.assertTrue(wanted in dirs) -+ wanted = os.path.join('xoxo', sys.lib, 'python' + sys.version[:3], -+ 'site-packages') -+ self.assertTrue(wanted in dirs) -+ wanted = os.path.join('xoxo', sys.lib, 'site-python') -+ self.assertTrue(wanted in dirs) - else: - # other platforms - self.assertEqual(len(dirs), 2) -Index: Python-2.7.13/Lib/trace.py -=================================================================== ---- Python-2.7.13.orig/Lib/trace.py -+++ Python-2.7.13/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.13/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 - - # Machine-dependent subdirectories - MACHDEP= @MACHDEP@ -+LIB= @LIB@ - - # Multiarch directory (may be empty) - MULTIARCH= @MULTIARCH@ -@@ -111,7 +112,7 @@ LIBDIR= @libdir@ - MANDIR= @mandir@ - INCLUDEDIR= @includedir@ - CONFINCLUDEDIR= $(exec_prefix)/include --SCRIPTDIR= $(prefix)/lib -+SCRIPTDIR= $(prefix)/@LIB@ - - # Detailed destination directories - BINLIBDEST= $(LIBDIR)/python$(VERSION) -@@ -669,6 +670,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 -@@ -709,7 +711,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 -+ $(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.13/Modules/getpath.c -=================================================================== ---- Python-2.7.13.orig/Modules/getpath.c -+++ Python-2.7.13/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.13/Python/getplatform.c -=================================================================== ---- Python-2.7.13.orig/Python/getplatform.c -+++ Python-2.7.13/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.13/Python/sysmodule.c -=================================================================== ---- Python-2.7.13.orig/Python/sysmodule.c -+++ Python-2.7.13/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", diff --git a/meta/recipes-devtools/python/python/parallel-makeinst-create-bindir.patch b/meta/recipes-devtools/python/python/parallel-makeinst-create-bindir.patch deleted file mode 100644 index 951cb466ff..0000000000 --- a/meta/recipes-devtools/python/python/parallel-makeinst-create-bindir.patch +++ /dev/null @@ -1,19 +0,0 @@ -When using make -j with the 'install' target, it's possible for altbininstall -(which normally creates BINDIR) and libainstall (which doesn't, though it -installs python-config there) to race, resulting in a failure due to -attempting to install python-config into a nonexistent BINDIR. Ensure it also -exists in the libainstall target. - -Upstream-Status: Pending - ---- Python-2.7.3.orig/Makefile.pre.in -+++ Python-2.7.3/Makefile.pre.in -@@ -1008,7 +1008,7 @@ LIBPL= $(LIBP)/config - LIBPC= $(LIBDIR)/pkgconfig - - libainstall: all python-config -- @for i in $(LIBDIR) $(LIBP) $(LIBPL) $(LIBPC); \ -+ @for i in $(LIBDIR) $(LIBP) $(LIBPL) $(LIBPC) $(BINDIR); \ - do \ - if test ! -d $(DESTDIR)$$i; then \ - echo "Creating directory $$i"; \ diff --git a/meta/recipes-devtools/python/python/pass-missing-libraries-to-Extension-for-mul.patch b/meta/recipes-devtools/python/python/pass-missing-libraries-to-Extension-for-mul.patch deleted file mode 100644 index 44fcaacf30..0000000000 --- a/meta/recipes-devtools/python/python/pass-missing-libraries-to-Extension-for-mul.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 71447f04979b267f8866573b67a4340b2719d799 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Fri, 4 Aug 2017 14:10:43 +0800 -Subject: [PATCH] setup.py: pass missing libraries to Extension for multiprocessing module - -In the following commit: -... -commit e711cafab13efc9c1fe6c5cd75826401445eb585 -Author: Benjamin Peterson <benjamin@python.org> -Date: Wed Jun 11 16:44:04 2008 +0000 - - Merged revisions 64104,64117 via svnmerge from - svn+ssh://pythondev@svn.python.org/python/trunk -... -(see diff in setup.py) -It assigned libraries for multiprocessing module according -the host_platform, but not pass it to Extension. - -In glibc, the following commit caused two definition of -sem_getvalue are different. -https://sourceware.org/git/?p=glibc.git;a=commit;h=042e1521c794a945edc43b5bfa7e69ad70420524 -(see diff in nptl/sem_getvalue.c for detail) -`__new_sem_getvalue' is the latest sem_getvalue@@GLIBC_2.1 -and `__old_sem_getvalue' is to compat the old version -sem_getvalue@GLIBC_2.0. - -To build python for embedded Linux systems: -http://www.yoctoproject.org/docs/2.3.1/yocto-project-qs/yocto-project-qs.html -If not explicitly link to library pthread (-lpthread), it will -load glibc's sem_getvalue randomly at runtime. - -Such as build python on linux x86_64 host and run the python -on linux x86_32 target. If not link library pthread, it caused -multiprocessing bounded semaphore could not work correctly. -... ->>> import multiprocessing ->>> pool_sema = multiprocessing.BoundedSemaphore(value=1) ->>> pool_sema.acquire() -True ->>> pool_sema.release() -Traceback (most recent call last): - File "<stdin>", line 1, in <module> -ValueError: semaphore or lock released too many times -... - -And the semaphore issue also caused multiprocessing.Queue().put() hung. - -Upstream-Status: Submitted [https://github.com/python/cpython/pull/2999] - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - setup.py | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/setup.py b/setup.py -index 54054c2..9646bfc 100644 ---- a/setup.py -+++ b/setup.py -@@ -1586,8 +1586,10 @@ class PyBuildExt(build_ext): - elif host_platform.startswith('netbsd'): - macros = dict() - libraries = [] -- -- else: # Linux and other unices -+ elif host_platform.startswith(('linux')): -+ macros = dict() -+ libraries = ['pthread'] -+ else: # Other unices - macros = dict() - libraries = ['rt'] - -@@ -1610,6 +1612,7 @@ class PyBuildExt(build_ext): - if sysconfig.get_config_var('WITH_THREAD'): - exts.append ( Extension('_multiprocessing', multiprocessing_srcs, - define_macros=macros.items(), -+ libraries=libraries, - include_dirs=["Modules/_multiprocessing"])) - else: - missing.append('_multiprocessing') --- -2.7.4 - diff --git a/meta/recipes-devtools/python/python/python-2.7.3-remove-bsdb-rpath.patch b/meta/recipes-devtools/python/python/python-2.7.3-remove-bsdb-rpath.patch deleted file mode 100644 index 216be0a448..0000000000 --- a/meta/recipes-devtools/python/python/python-2.7.3-remove-bsdb-rpath.patch +++ /dev/null @@ -1,28 +0,0 @@ -Upstream-Status: Inappropriate [embedded specific] - -Remove the RPATH to avoid QA issue warning. - -RP: Added secondary unnecessary rpath to the list 2012/8/7 -Signed-off-by: Jackie Huang <jackie.huang@windriver.com> - - -Index: Python-2.7.3/setup.py -=================================================================== ---- Python-2.7.3.orig/setup.py 2012-08-07 10:41:58.560132529 +0000 -+++ Python-2.7.3/setup.py 2012-08-07 11:09:47.852094515 +0000 -@@ -1042,7 +1042,6 @@ - exts.append(Extension('_bsddb', ['_bsddb.c'], - depends = ['bsddb.h'], - library_dirs=dblib_dir, -- runtime_library_dirs=dblib_dir, - include_dirs=db_incs, - libraries=dblibs)) - else: -@@ -1252,7 +1251,6 @@ - print "building dbm using bdb" - dbmext = Extension('dbm', ['dbmmodule.c'], - library_dirs=dblib_dir, -- runtime_library_dirs=dblib_dir, - include_dirs=db_incs, - define_macros=[ - ('HAVE_BERKDB_H', None), diff --git a/meta/recipes-devtools/python/python/run-ptest b/meta/recipes-devtools/python/python/run-ptest deleted file mode 100644 index a2f9eed444..0000000000 --- a/meta/recipes-devtools/python/python/run-ptest +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -# -#This script is used to run python test suites - -make -f LIBDIR/python/ptest/Makefile -k runtest-TESTS srcdir=LIBDIR/python2.7 TESTPROG=LIBDIR/python2.7/test/regrtest.py | sed -e '/\.\.\. ok/ s/^/PASS: /g' -e '/\.\.\. [ERROR|FAIL]/ s/^/FAIL: /g' -e '/\.\.\. skipped/ s/^/SKIP: /g' -e 's/ \.\.\. ok//g' -e 's/ \.\.\. ERROR//g' -e 's/ \.\.\. FAIL//g' -e 's/ \.\.\. skipped//g' diff --git a/meta/recipes-devtools/python/python/search_db_h_in_inc_dirs_and_avoid_warning.patch b/meta/recipes-devtools/python/python/search_db_h_in_inc_dirs_and_avoid_warning.patch deleted file mode 100644 index dacb552ec7..0000000000 --- a/meta/recipes-devtools/python/python/search_db_h_in_inc_dirs_and_avoid_warning.patch +++ /dev/null @@ -1,35 +0,0 @@ -python should search for db.h in inc_dirs and not in a hardcoded path. -If db.h is found but HASHVERSION is not 2 we avoid a warning by not -adding this module to missing variable. - -Upstream-Status: Inappropriate [distribution] - -Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> - - -diff --git a/setup.py b/setup.py -index b887808..ae51607 100644 ---- a/setup.py -+++ b/setup.py -@@ -1237,6 +1237,8 @@ class PyBuildExt(build_ext): - # the more recent berkeleydb's db.h file first in the include path - # when attempting to compile and it will fail. - f = "/usr/include/db.h" -+ if len(inc_dirs) != 0: -+ f = os.path.join(inc_dirs[0], "db.h") - - if host_platform == 'darwin': - if is_macosx_sdk_path(f): -@@ -1257,8 +1259,10 @@ class PyBuildExt(build_ext): - libraries=libraries)) - else: - exts.append(Extension('bsddb185', ['bsddbmodule.c'])) -- else: -- missing.append('bsddb185') -+ # If a newer version is detected don't report an useless -+ # warning -+ #else: -+ # missing.append('bsddb185') - else: - missing.append('bsddb185') - diff --git a/meta/recipes-devtools/python/python/setup_py_skip_cross_import_check.patch b/meta/recipes-devtools/python/python/setup_py_skip_cross_import_check.patch deleted file mode 100644 index 6ccdb948b9..0000000000 --- a/meta/recipes-devtools/python/python/setup_py_skip_cross_import_check.patch +++ /dev/null @@ -1,27 +0,0 @@ -This patch skips over the 'import check' setup.py does when building -extensions. This generally won't work when cross-compiling. - -Upstream-Status: Inappropriate [embedded-specific] - -Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> - -Index: Python-2.7.2/setup.py -=================================================================== ---- Python-2.7.2.orig/setup.py 2011-11-04 16:46:34.553796410 -0500 -+++ Python-2.7.2/setup.py 2011-11-04 16:59:49.692802313 -0500 -@@ -287,6 +287,15 @@ - (ext.name, sys.exc_info()[1])) - self.failed.append(ext.name) - return -+ -+ # If we're cross-compiling, we want to skip the import check -+ # i.e. we shouldn't be dynamically loading target shared libs -+ if os.environ.get('CROSS_COMPILE') is not None: -+ self.announce( -+ 'WARNING: skipping import check for cross-compiled "%s"' % -+ ext.name) -+ return -+ - # Workaround for Mac OS X: The Carbon-based modules cannot be - # reliably imported into a command-line Python - if 'Carbon' in ext.extra_link_args: diff --git a/meta/recipes-devtools/python/python/setuptweaks.patch b/meta/recipes-devtools/python/python/setuptweaks.patch deleted file mode 100644 index 3a91b1916c..0000000000 --- a/meta/recipes-devtools/python/python/setuptweaks.patch +++ /dev/null @@ -1,57 +0,0 @@ -This patch removes various ways native system options can pass into the python -compilation and somehow break C modules. - -Upstream-Status: Inappropriate [OE Specific] - -RP 2012/04/23 - -Index: Python-2.7.2/setup.py -=================================================================== ---- Python-2.7.2.orig/setup.py 2012-04-23 20:03:47.295582553 +0000 -+++ Python-2.7.2/setup.py 2012-04-23 20:03:15.000000000 +0000 -@@ -231,7 +231,13 @@ - # compilers - if compiler is not None: - (ccshared,cflags) = sysconfig.get_config_vars('CCSHARED','CFLAGS') -- args['compiler_so'] = compiler + ' ' + ccshared + ' ' + cflags -+ # Need to filter out -isysroot from the flags. Ideally should -+ # figure out target flags here. -+ flags = [] -+ for f in cflags.split(): -+ if not f.startswith("-isystem"): -+ flags.append(f) -+ args['compiler_so'] = compiler + ' ' + ccshared + ' ' + ' '.join(flags) - self.compiler.set_executables(**args) - - build_ext.build_extensions(self) -@@ -393,7 +399,6 @@ - # into configure and stored in the Makefile (issue found on OS X 10.3). - for env_var, arg_name, dir_list in ( - ('LDFLAGS', '-R', self.compiler.runtime_library_dirs), -- ('LDFLAGS', '-L', self.compiler.library_dirs), - ('CPPFLAGS', '-I', self.compiler.include_dirs)): - env_val = sysconfig.get_config_var(env_var) - if env_val: -@@ -419,16 +424,16 @@ - for directory in reversed(options.dirs): - add_dir_to_list(dir_list, directory) - -- if os.path.normpath(sys.prefix) != '/usr' \ -- and not sysconfig.get_config_var('PYTHONFRAMEWORK'): -+# if os.path.normpath(sys.prefix) != '/usr' \ -+# and not sysconfig.get_config_var('PYTHONFRAMEWORK'): - # OSX note: Don't add LIBDIR and INCLUDEDIR to building a framework - # (PYTHONFRAMEWORK is set) to avoid # linking problems when - # building a framework with different architectures than - # the one that is currently installed (issue #7473) -- add_dir_to_list(self.compiler.library_dirs, -- sysconfig.get_config_var("LIBDIR")) -- add_dir_to_list(self.compiler.include_dirs, -- sysconfig.get_config_var("INCLUDEDIR")) -+# add_dir_to_list(self.compiler.library_dirs, -+# sysconfig.get_config_var("LIBDIR")) -+# add_dir_to_list(self.compiler.include_dirs, -+# sysconfig.get_config_var("INCLUDEDIR")) - - try: - have_unicode = unicode diff --git a/meta/recipes-devtools/python/python/sitecustomize.py b/meta/recipes-devtools/python/python/sitecustomize.py deleted file mode 100644 index 273901898a..0000000000 --- a/meta/recipes-devtools/python/python/sitecustomize.py +++ /dev/null @@ -1,45 +0,0 @@ -# OpenEmbedded sitecustomize.py (C) 2002-2008 Michael 'Mickey' Lauer <mlauer@vanille-media.de> -# GPLv2 or later -# Version: 20081123 -# Features: -# * set proper default encoding -# * enable readline completion in the interactive interpreter -# * load command line history on startup -# * save command line history on exit - -import os - -def __exithandler(): - try: - readline.write_history_file( "%s/.python-history" % os.getenv( "HOME", "/tmp" ) ) - except IOError: - pass - -def __registerExitHandler(): - import atexit - atexit.register( __exithandler ) - -def __enableReadlineSupport(): - readline.set_history_length( 1000 ) - readline.parse_and_bind( "tab: complete" ) - try: - readline.read_history_file( "%s/.python-history" % os.getenv( "HOME", "/tmp" ) ) - except IOError: - pass - -def __enableDefaultEncoding(): - import sys - try: - sys.setdefaultencoding( "utf8" ) - except LookupError: - pass - -import sys -try: - import rlcompleter, readline -except ImportError: - pass -else: - __enableDefaultEncoding() - __registerExitHandler() - __enableReadlineSupport() diff --git a/meta/recipes-devtools/python/python/support_SOURCE_DATE_EPOCH_in_py_compile_2.7.patch b/meta/recipes-devtools/python/python/support_SOURCE_DATE_EPOCH_in_py_compile_2.7.patch deleted file mode 100644 index 12651798ee..0000000000 --- a/meta/recipes-devtools/python/python/support_SOURCE_DATE_EPOCH_in_py_compile_2.7.patch +++ /dev/null @@ -1,34 +0,0 @@ -The compiled .pyc files contain time stamp corresponding to the compile time. -This prevents binary reproducibility. This patch allows to achieve binary -reproducibility by overriding the build time stamp by the value -exported via SOURCE_DATE_EPOCH. - -Patch by Bernhard M. Wiedemann - -Upstream-Status: Backport - -Signed-off-by: Juro Bystricky <juro.bystricky@intel.com> - -Fri Feb 24 17:08:25 UTC 2017 - bwiedemann@suse.com - -- Add reproducible.patch to allow reproducible builds of various - python packages like python-amqp - Upstream: https://github.com/python/cpython/pull/296 - - -@@ -0,0 +1,15 @@ -Index: Python-2.7.13/Lib/py_compile.py -=================================================================== ---- Python-2.7.13.orig/Lib/py_compile.py -+++ Python-2.7.13/Lib/py_compile.py -@@ -108,6 +108,10 @@ def compile(file, cfile=None, dfile=None - timestamp = long(os.fstat(f.fileno()).st_mtime) - except AttributeError: - timestamp = long(os.stat(file).st_mtime) -+ sde = os.environ.get('SOURCE_DATE_EPOCH') -+ if sde and timestamp > int(sde): -+ timestamp = int(sde) -+ os.utime(file, (timestamp, timestamp)) - codestring = f.read() - try: - codeobject = __builtin__.compile(codestring, dfile or file,'exec') diff --git a/meta/recipes-devtools/python/python/use_sysroot_ncurses_instead_of_host.patch b/meta/recipes-devtools/python/python/use_sysroot_ncurses_instead_of_host.patch deleted file mode 100644 index fb4a3bcf95..0000000000 --- a/meta/recipes-devtools/python/python/use_sysroot_ncurses_instead_of_host.patch +++ /dev/null @@ -1,21 +0,0 @@ -Python tries to use ncursesw from the host, -if it is not found causes an error on configure, -we should use ncursesw from sysroot instead - -Upstream-Status: Pending - -Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com> - -Index: Python-2.7.9/configure.ac -=================================================================== ---- Python-2.7.9.orig/configure.ac -+++ Python-2.7.9/configure.ac -@@ -4311,7 +4311,7 @@ fi - - # first curses configure check - ac_save_cppflags="$CPPFLAGS" --CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw" -+CPPFLAGS="$CPPFLAGS -I=/usr/include/ncursesw" - - AC_CHECK_HEADERS(curses.h ncurses.h) - |