python3: Upgrade from 3.4.3 to 3.5
cover python3: Upgrade from 3.4.3 to 3.5
Upgrades from python 3.4.3 to python 3.5, rebases some patches, modifies the related classes accordingly and also fixes an issue with python3-pip
The following changes since commit fc45deac89ef63ca1c44e763c38ced7dfd72cbe1:
build-appliance-image: Update to jethro head revision (2015-11-03 14:03:03 +0000)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib hsalejandro/py35upgrade
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=hsalejandro/py35upgrade
Alejandro Hernandez (1):
python3: Upgrade from 3.4.3 to 3.5
meta/classes/distutils3-base.bbclass | 2 +-
meta/classes/distutils3-native-base.bbclass | 2 +-
meta/classes/python3native.bbclass | 2 +-
...on-3.4-manifest.inc => python-3.5-manifest.inc} | 126 +++++++++----------
...on3-native_3.4.3.bb => python3-native_3.5.0.bb} | 7 +-
meta/recipes-devtools/python/python3-pip_6.1.1.bb | 8 +-
.../python/python3/000-cross-compile.patch | 36 +++---
.../python3/020-dont-compile-python-files.patch | 19 ++-
.../python/python3/04-default-is-optimized.patch | 38 +++---
.../recipes-devtools/python/python3/makerace.patch | 28 -----
.../python/python3/python-3.3-multilib.patch | 140 +++++++++------------
.../python/{python3_3.4.3.bb => python3_3.5.0.bb} | 7 +-
...te-manifest-3.4.py => generate-manifest-3.5.py} | 2 +-
13 files changed, 190 insertions(+), 227 deletions(-)
rename meta/recipes-devtools/python/{python-3.4-manifest.inc => python-3.5-manifest.inc} (51%)
rename meta/recipes-devtools/python/{python3-native_3.4.3.bb => python3-native_3.5.0.bb} (92%)
delete mode 100644 meta/recipes-devtools/python/python3/makerace.patch
rename meta/recipes-devtools/python/{python3_3.4.3.bb => python3_3.5.0.bb} (97%)
rename scripts/contrib/python/{generate-manifest-3.4.py => generate-manifest-3.5.py} (99%)Signature · 1 line
1.8.4.5
PATCH 1/1 python3: Upgrade from 3.4.3 to 3.5
python3-native_3.4.3.bb -> python3-native_3.5.0.bb:
- changed version
- changed cheksum
- no license change, just dates
python3_3.4.3.bb -> python3_3.5.0.bb:
- changed version
- changed cheksum
- no license change, just dates
Rebased:
- Manifest
- 000-cross-compile.patch
- 020-dont-compile-python-files.patch
- 04-default-is-optimized.patch
- python-3.3-multilib.patch
- distutils3-base.bbclass
- distutils3-native-base.bbclass
- python3native.bbclass
Upstream:
- makerace.patch
Misc:
- pip2 is handled as default on major distros, modified python3-pip to leave /usr/bin/pip available for pip2
- Fixed importing pip3 from python3 interpreter
Signed-off-by Alejandro Hernandez <[email protected]>
---
meta/classes/distutils3-base.bbclass | 2 +-
meta/classes/distutils3-native-base.bbclass | 2 +-
meta/classes/python3native.bbclass | 2 +-
...on-3.4-manifest.inc => python-3.5-manifest.inc} | 126 +++++++++----------
...on3-native_3.4.3.bb => python3-native_3.5.0.bb} | 7 +-
meta/recipes-devtools/python/python3-pip_6.1.1.bb | 8 +-
.../python/python3/000-cross-compile.patch | 36 +++---
.../python3/020-dont-compile-python-files.patch | 19 ++-
.../python/python3/04-default-is-optimized.patch | 38 +++---
.../recipes-devtools/python/python3/makerace.patch | 28 -----
.../python/python3/python-3.3-multilib.patch | 140 +++++++++------------
.../python/{python3_3.4.3.bb => python3_3.5.0.bb} | 7 +-
...te-manifest-3.4.py => generate-manifest-3.5.py} | 2 +-
13 files changed, 190 insertions(+), 227 deletions(-)
rename meta/recipes-devtools/python/{python-3.4-manifest.inc => python-3.5-manifest.inc} (51%)
rename meta/recipes-devtools/python/{python3-native_3.4.3.bb => python3-native_3.5.0.bb} (92%)
delete mode 100644 meta/recipes-devtools/python/python3/makerace.patch
rename meta/recipes-devtools/python/{python3_3.4.3.bb => python3_3.5.0.bb} (97%)
rename scripts/contrib/python/{generate-manifest-3.4.py => generate-manifest-3.5.py} (99%)meta/classes/distutils3-base.bbclass +1 -1
@@ -1,7 +1,7 @@ DEPENDS += "${@["${PYTHON_PN}-native ${PYTHON_PN}", ""][(d.getVar('PACKAGES', True) == '')]}" RDEPENDS_${PN} += "${@['', '${PYTHON_PN}-core']['${CLASSOVERRIDE}' == 'class-target']}" -PYTHON_BASEVERSION = "3.4" +PYTHON_BASEVERSION = "3.5" PYTHON_ABI = "m" inherit distutils-common-base python3native
meta/classes/distutils3-native-base.bbclass +1 -1
@@ -1,4 +1,4 @@ -PYTHON_BASEVERSION = "3.4" +PYTHON_BASEVERSION = "3.5" PYTHON_ABI = "m" inherit distutils-native-base
meta/classes/python3native.bbclass +1 -1
@@ -1,4 +1,4 @@ -PYTHON_BASEVERSION = "3.4" +PYTHON_BASEVERSION = "3.5" inherit python-dir
meta/recipes-devtools/python/python-3.5-manifest.inc renamed from meta/recipes-devtools/python/python-3.4-manifest.inc +63 -63
323 lines not on this page · raw message
meta/recipes-devtools/python/python3-native_3.5.0.bb renamed from meta/recipes-devtools/python/python3-native_3.4.3.bb +3 -4
@@ -1,7 +1,7 @@ require recipes-devtools/python/python.inc PR = "${INC_PR}.0" -PYTHON_MAJMIN = "3.4" +PYTHON_MAJMIN = "3.5" DISTRO_SRC_URI ?= "file://sitecustomize.py" DISTRO_SRC_URI_linuxstdbase = "" SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \
@@ -22,13 +22,12 @@ file://shutil-follow-symlink-fix.patch \ file://0001-h2py-Fix-issue-13032-where-it-fails-with-UnicodeDeco.patch \ file://sysroot-include-headers.patch \ file://unixccompiler.patch \ -file://makerace.patch \ ${DISTRO_SRC_URI} \ file://sysconfig.py-add-_PYTHON_PROJECT_SRC.patch \ file://setup.py-check-cross_compiling-when-get-FLAGS.patch \ " -SRC_URI[md5sum] = "7d092d1bba6e17f0d9bd21b49e441dd5" -SRC_URI[sha256sum] = "b5b3963533768d5fc325a4d7a6bd6f666726002d696f1d399ec06b043ea996b8" +SRC_URI[md5sum] = "d149d2812f10cbe04c042232e7964171" +SRC_URI[sha256sum] = "d6d7aa1634a5eeeca6ed4fca266982a04f84bd8f3945a9179e20b24ad2e2be91" LIC_FILES_CHKSUM = "file://LICENSE;md5=dd98d01d471fac8d8dbdd975229dba03"
meta/recipes-devtools/python/python3-pip_6.1.1.bb +7 -1
@@ -26,7 +26,13 @@ do_install_prepend() { # Use setuptools site.py instead, avoid shared state issue do_install_append() { rm ${D}/${libdir}/${PYTHON_DIR}/site-packages/site.py - rm ${D}/${libdir}/${PYTHON_DIR}/site-packages/__pycache__/site.cpython-34.pyc + rm ${D}/${libdir}/${PYTHON_DIR}/site-packages/__pycache__/site.cpython-*.pyc + + # Install as pip3 and leave pip2 as default + rm ${D}/${bindir}/pip + + # Installed eggs need to be passed directly to the interpreter via a pth file + echo "./${SRCNAME}-${PV}-py${PYTHON_BASEVERSION}.egg" > ${D}${PYTHON_SITEPACKAGES_DIR}/${SRCNAME}-${PV}.pth } RDEPENDS_${PN} = "\
meta/recipes-devtools/python/python3/000-cross-compile.patch +19 -17
@@ -9,9 +9,11 @@ Upstream-Status: Inappropriate[Configuration Specific] Makefile.pre.in | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -193,6 +193,7 @@ LIBOBJS= @LIBOBJS@ +Index: Python-3.5.0/Makefile.pre.in +=================================================================== +--- Python-3.5.0.orig/Makefile.pre.in ++++ Python-3.5.0/Makefile.pre.in +@@ -215,6 +215,7 @@ LIBOBJS= @LIBOBJS@ PYTHON= python$(EXE) BUILDPYTHON= python$(BUILDEXE)
@@ -19,7 +21,7 @@ Upstream-Status: Inappropriate[Configuration Specific] PYTHON_FOR_BUILD=@PYTHON_FOR_BUILD@ _PYTHON_HOST_PLATFORM=@_PYTHON_HOST_PLATFORM@ -@@ -239,6 +240,7 @@ LIBFFI_INCLUDEDIR= @LIBFFI_INCLUDEDIR@ +@@ -272,6 +273,7 @@ LIBFFI_INCLUDEDIR= @LIBFFI_INCLUDEDIR@ ########################################################################## # Parser PGEN= Parser/pgen$(EXE)
@@ -27,7 +29,7 @@ Upstream-Status: Inappropriate[Configuration Specific] PSRCS= \ Parser/acceler.c \ -@@ -451,7 +453,7 @@ build_all_generate_profile: +@@ -494,7 +496,7 @@ build_all_generate_profile: run_profile_task: : # FIXME: can't run for a cross build
@@ -35,17 +37,17 @@ Upstream-Status: Inappropriate[Configuration Specific] + $(RUNSHARED) $(HOSTPYTHON) $(PROFILE_TASK) build_all_use_profile: - $(MAKE) all CFLAGS="$(CFLAGS) -fprofile-use -fprofile-correction" -@@ -640,7 +642,7 @@ $(IO_OBJS): $(IO_H) - $(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGENSRCS) + $(MAKE) all CFLAGS_NODIST="$(CFLAGS) -fprofile-use -fprofile-correction" +@@ -764,7 +766,7 @@ $(IO_OBJS): $(IO_H) + + $(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGEN) @$(MKDIR_P) Include - $(MAKE) $(PGEN) - $(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) + $(HOSTPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) - $(GRAMMAR_C): $(GRAMMAR_H) $(GRAMMAR_INPUT) $(PGENSRCS) - $(MAKE) $(GRAMMAR_H) + $(GRAMMAR_C): $(GRAMMAR_H) touch $(GRAMMAR_C) -@@ -820,7 +822,7 @@ $(LIBRARY_OBJS) $(MODOBJS) Modules/pytho + +@@ -953,7 +955,7 @@ $(LIBRARY_OBJS) $(MODOBJS) Programs/pyth ###################################################################### TESTOPTS= $(EXTRATESTOPTS)
@@ -54,7 +56,7 @@ Upstream-Status: Inappropriate[Configuration Specific] TESTRUNNER= $(TESTPYTHON) $(srcdir)/Tools/scripts/run_tests.py TESTTIMEOUT= 3600 -@@ -1229,7 +1231,7 @@ frameworkinstallstructure: $(LDLIBRARY) +@@ -1440,7 +1442,7 @@ frameworkinstallstructure: $(LDLIBRARY) fi; \ done $(LN) -fsn include/python$(LDVERSION) $(DESTDIR)$(prefix)/Headers
@@ -63,7 +65,7 @@ Upstream-Status: Inappropriate[Configuration Specific] $(LN) -fsn $(VERSION) $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Versions/Current $(LN) -fsn Versions/Current/$(PYTHONFRAMEWORK) $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/$(PYTHONFRAMEWORK) $(LN) -fsn Versions/Current/Headers $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Headers -@@ -1288,7 +1290,7 @@ config.status: $(srcdir)/configure +@@ -1506,7 +1508,7 @@ config.status: $(srcdir)/configure # Run reindent on the library reindent:
@@ -72,12 +74,12 @@ Upstream-Status: Inappropriate[Configuration Specific] # Rerun configure with the same options as it was run last time, # provided the config.status script exists -@@ -1414,7 +1416,7 @@ funny: +@@ -1639,7 +1641,7 @@ funny: # Perform some verification checks on any modified files. - patchcheck: + patchcheck: all - $(RUNSHARED) ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/patchcheck.py -+ $(RUNSHARED) $(HOSTPYTHON) $(srcdir)/Tools/scripts/patchcheck.py ++ $(RUNSHARED) ./$(HOSTPYTHON) $(srcdir)/Tools/scripts/patchcheck.py # Dependencies
meta/recipes-devtools/python/python3/020-dont-compile-python-files.patch +15 -4
@@ -8,9 +8,11 @@ Upstream-Status: Inappropriate[Embedded-Specific] Makefile.pre.in | 16 ---------------- 1 file changed, 16 deletions(-) ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -1078,24 +1078,6 @@ libinstall: build_all $(srcdir)/Lib/$(PL +Index: Python-3.5.0/Makefile.pre.in +=================================================================== +--- Python-3.5.0.orig/Makefile.pre.in ++++ Python-3.5.0/Makefile.pre.in +@@ -1262,33 +1262,6 @@ libinstall: build_all $(srcdir)/Lib/$(PL $(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \ $(DESTDIR)$(LIBDEST)/distutils/tests ; \ fi
@@ -24,7 +26,12 @@ Upstream-Status: Inappropriate[Embedded-Specific] - -d $(LIBDEST) -f \ - -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ - $(DESTDIR)$(LIBDEST) -- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ +- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ +- $(PYTHON_FOR_BUILD) -Wi -OO $(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 $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST)/site-packages -f \ - -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
@@ -32,6 +39,10 @@ Upstream-Status: Inappropriate[Embedded-Specific] - $(PYTHON_FOR_BUILD) -Wi -O $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST)/site-packages -f \ - -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages +- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ +- $(PYTHON_FOR_BUILD) -Wi -OO $(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 -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
meta/recipes-devtools/python/python3/04-default-is-optimized.patch +19 -19
@@ -12,24 +12,11 @@ Signed-Off-By: Nitin A Kamble <[email protected]> Rebased for 3.4.2 02/2015 Signed-off-by: Alejandro Hernandez <[email protected]> -Index: Python-3.4.2/Python/compile.c +Index: Python-3.5.0/Modules/main.c =================================================================== ---- Python-3.4.2.orig/Python/compile.c -+++ Python-3.4.2/Python/compile.c -@@ -30,7 +30,7 @@ - #include "symtable.h" - #include "opcode.h" - --int Py_OptimizeFlag = 0; -+int Py_OptimizeFlag = 1; - - #define DEFAULT_BLOCK_SIZE 16 - #define DEFAULT_BLOCKS 8 -Index: Python-3.4.2/Modules/main.c -=================================================================== ---- Python-3.4.2.orig/Modules/main.c -+++ Python-3.4.2/Modules/main.c -@@ -38,7 +38,7 @@ static wchar_t **orig_argv; +--- Python-3.5.0.orig/Modules/main.c ++++ Python-3.5.0/Modules/main.c +@@ -37,7 +37,7 @@ static wchar_t **orig_argv; static int orig_argc; /* command line options */
@@ -38,7 +25,7 @@ Index: Python-3.4.2/Modules/main.c #define PROGRAM_OPTS BASE_OPTS -@@ -64,6 +64,7 @@ static char *usage_2 = "\ +@@ -63,6 +63,7 @@ static char *usage_2 = "\ -m mod : run library module as a script (terminates option list)\n\ -O : optimize generated bytecode slightly; also PYTHONOPTIMIZE=x\n\ -OO : remove doc-strings in addition to the -O optimizations\n\
@@ -46,7 +33,7 @@ Index: Python-3.4.2/Modules/main.c -q : don't print version and copyright messages on interactive startup\n\ -s : don't add user site directory to sys.path; also PYTHONNOUSERSITE\n\ -S : don't imply 'import site' on initialization\n\ -@@ -418,8 +419,8 @@ Py_Main(int argc, wchar_t **argv) +@@ -419,8 +420,8 @@ Py_Main(int argc, wchar_t **argv) /* case 'J': reserved for Jython */
@@ -57,3 +44,16 @@ Index: Python-3.4.2/Modules/main.c break; case 'B': +Index: Python-3.5.0/Python/pylifecycle.c +=================================================================== +--- Python-3.5.0.orig/Python/pylifecycle.c ++++ Python-3.5.0/Python/pylifecycle.c +@@ -80,7 +80,7 @@ int Py_VerboseFlag; /* Needed by import. + int Py_QuietFlag; /* Needed by sysmodule.c */ + int Py_InteractiveFlag; /* Needed by Py_FdIsInteractive() below */ + int Py_InspectFlag; /* Needed to determine whether to exit at SystemExit */ +-int Py_OptimizeFlag = 0; /* Needed by compile.c */ ++int Py_OptimizeFlag = 1; /* Needed by compile.c */ + int Py_NoSiteFlag; /* Suppress 'import site' */ + int Py_BytesWarningFlag; /* Warn on str(bytes) and str(buffer) */ + int Py_UseClassExceptionsFlag = 1; /* Needed by bltinmodule.c: deprecated */
meta/recipes-devtools/python/python3/makerace.patch deleted +0 -28
@@ -1,28 +0,0 @@ -There is a race due to the execution of make inside the makefile: - -| gcc -pthread -c -Wno-unused-result -DNDEBUG -g -O3 -Wall -Wstrict-prototypes -isystem/home/pokybuild/yocto-autobuilder-dev/yocto-slave/nightly-world/build/build/tmp/sysroots/x86_64-linux/usr/include -O2 -pipe -isystem/home/pokybuild/yocto-autobuilder-dev/yocto-slave/nightly-world/build/build/tmp/sysroots/x86_64-linux/usr/include -O2 -pipe -I. -IInclude -I./Include -isystem/home/pokybuild/yocto-autobuilder-dev/yocto-slave/nightly-world/build/build/tmp/sysroots/x86_64-linux/usr/include -isystem/home/pokybuild/yocto-autobuilder-dev/yocto-slave/nightly-world/build/build/tmp/sysroots/x86_64-linux/usr/include -fPIC -DPy_BUILD_CORE -o Objects/obmalloc.o Objects/obmalloc.c -| gcc -pthread -c -Wno-unused-result -DNDEBUG -g -O3 -Wall -Wstrict-prototypes -isystem/home/pokybuild/yocto-autobuilder-dev/yocto-slave/nightly-world/build/build/tmp/sysroots/x86_64-linux/usr/include -O2 -pipe -isystem/home/pokybuild/yocto-autobuilder-dev/yocto-slave/nightly-world/build/build/tmp/sysroots/x86_64-linux/usr/include -O2 -pipe -I. -IInclude -I./Include -isystem/home/pokybuild/yocto-autobuilder-dev/yocto-slave/nightly-world/build/build/tmp/sysroots/x86_64-linux/usr/include -isystem/home/pokybuild/yocto-autobuilder-dev/yocto-slave/nightly-world/build/build/tmp/sysroots/x86_64-linux/usr/include -fPIC -DPy_BUILD_CORE -o Parser/pgen.o Parser/pgen.c| gcc -pthread -c -Wno-unused-result -DNDEBUG -g -O3 -Wall -Wstrict-prototypes -isystem/home/pokybuild/yocto-autobuilder-dev/yocto-slave/nightly-world/build/build/tmp/sysroots/x86_64-linux/usr/include -O2 -pipe -isystem/home/pokybuild/yocto-autobuilder-dev/yocto-slave/nightly-world/build/build/tmp/sysroots/x86_64-linux/usr/include -O2 -pipe -I. -IInclude -I./Include -isystem/home/pokybuild/yocto-autobuilder-dev/yocto-slave/nightly-world/build/build/tmp/sysroots/x86_64-linux/usr/include -isystem/home/pokybuild/yocto-autobuilder-dev/yocto-slave/nightly-world/build/build/tmp/sysroots/x86_64-linux/usr/include -fPIC -DPy_BUILD_CORE -o Objects/obmalloc.o Objects/obmalloc.c -| gcc -pthread -c -Wno-unused-result -DNDEBUG -g -O3 -Wall -Wstrict-prototypes -isystem/home/pokybuild/yocto-autobuilder-dev/yocto-slave/nightly-world/build/build/tmp/sysroots/x86_64-linux/usr/include -O2 -pipe -isystem/home/pokybuild/yocto-autobuilder-dev/yocto-slave/nightly-world/build/build/tmp/sysroots/x86_64-linux/usr/include -O2 -pipe -I. -IInclude -I./Include -isystem/home/pokybuild/yocto-autobuilder-dev/yocto-slave/nightly-world/build/build/tmp/sysroots/x86_64-linux/usr/include -isystem/home/pokybuild/yocto-autobuilder-dev/yocto-slave/nightly-world/build/build/tmp/sysroots/x86_64-linux/usr/include -fPIC -DPy_BUILD_CORE -o Objects/obmalloc.o Objects/obmalloc.c -| Objects/obmalloc.o: file not recognized: File truncated -| collect2: error: ld returned 1 exit status -| make[1]: *** [Parser/pgen] Error 1 - -The easiest way to avoid this is to list the dependencies explictly. - -RP 28/2/2014 - -Upstream-Status: Pending - -Index: Python-3.3.3/Makefile.pre.in -=================================================================== ---- Python-3.3.3.orig/Makefile.pre.in 2014-02-27 14:04:38.268339533 +0000 -+++ Python-3.3.3/Makefile.pre.in 2014-02-28 10:40:59.166361125 +0000 -@@ -676,7 +676,7 @@ - - $(IO_OBJS): $(IO_H) - --$(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGENSRCS) -+$(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGENSRCS) $(PGEN) - @$(MKDIR_P) Include - $(MAKE) $(PGEN) - $(HOSTPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
meta/recipes-devtools/python/python3/python-3.3-multilib.patch +57 -83
240 lines not on this page · raw message
meta/recipes-devtools/python/python3_3.5.0.bb renamed from meta/recipes-devtools/python/python3_3.4.3.bb +3 -4
@@ -2,7 +2,7 @@ require recipes-devtools/python/python.inc DEPENDS = "python3-native libffi bzip2 db gdbm openssl readline sqlite3 zlib virtual/libintl xz" PR = "${INC_PR}.0" -PYTHON_MAJMIN = "3.4" +PYTHON_MAJMIN = "3.5" PYTHON_BINABI= "${PYTHON_MAJMIN}m" DISTRO_SRC_URI ?= "file://sitecustomize.py" DISTRO_SRC_URI_linuxstdbase = ""
@@ -17,7 +17,6 @@ file://110-enable-zlib.patch \ file://130-readline-setup.patch \ file://150-fix-setupterm.patch \ file://0001-h2py-Fix-issue-13032-where-it-fails-with-UnicodeDeco.patch \ -file://makerace.patch \ ${DISTRO_SRC_URI} \ "
@@ -38,8 +37,8 @@ SRC_URI += "\ file://setup.py-check-cross_compiling-when-get-FLAGS.patch \ file://setup.py-find-libraries-in-staging-dirs.patch \ " -SRC_URI[md5sum] = "7d092d1bba6e17f0d9bd21b49e441dd5" -SRC_URI[sha256sum] = "b5b3963533768d5fc325a4d7a6bd6f666726002d696f1d399ec06b043ea996b8" +SRC_URI[md5sum] = "d149d2812f10cbe04c042232e7964171" +SRC_URI[sha256sum] = "d6d7aa1634a5eeeca6ed4fca266982a04f84bd8f3945a9179e20b24ad2e2be91" LIC_FILES_CHKSUM = "file://LICENSE;md5=dd98d01d471fac8d8dbdd975229dba03"
scripts/contrib/python/generate-manifest-3.5.py renamed from scripts/contrib/python/generate-manifest-3.4.py +1 -1
@@ -17,7 +17,7 @@ import os import sys import time -VERSION = "3.4.2" +VERSION = "3.5.0" __author__ = "Michael 'Mickey' Lauer <[email protected]>" __version__ = "20140131"
Signature · 1 line
1.8.4.5
Quoted 4 lines · Alejandro Hernandez
Upgrades from python 3.4.3 to python 3.5, rebases some patches, modifies the related classes accordingly and also fixes an issue with python3-pip
This failed on the autobuilder in the world-lsb target:
| ./Programs/_freeze_importlib \
| /home/pokybuild/yocto-autobuilder/yocto-worker/nightly-world-lsb/build/build/tmp/work/x86-pokymllib32-linux/lib32-python3/3.5.0-r1.0/Python-3.5.0/Lib/importlib/_bootstrap.py Python/importlib.h
| ./Programs/_freeze_importlib \
| /home/pokybuild/yocto-autobuilder/yocto-worker/nightly-world-lsb/build/build/tmp/work/x86-pokymllib32-linux/lib32-python3/3.5.0-r1.0/Python-3.5.0/Lib/importlib/_bootstrap_external.py Python/importlib_external.h
| ./Programs/_freeze_importlib: error while loading shared libraries:
libz.so.1: cannot open shared object file: No such file or directory
| ./Programs/_freeze_importlib: error while loading shared libraries:
libz.so.1: cannot open shared object file: No such file or directory
Considering zlib is a DEPENDS I have no idea why this happens. :(
Ross
Quoted 16 lines · Ross
This failed on the autobuilder in the world-lsb target:
| ./Programs/_freeze_importlib \
|/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-world-lsb/build/build/tmp/work/x86-pokymllib32-linux/lib32-python3/3.5.0-r1.0/Python-3.5.0/Lib/importlib/_bootstrap.pyPython/importlib.h
| ./Programs/_freeze_importlib \
|/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-world-lsb/build/build/tmp/work/x86-pokymllib32-linux/lib32-python3/3.5.0-r1.0/Python-3.5.0/Lib/importlib/_bootstrap_external.pyPython
/importlib_external.h
| ./Programs/_freeze_importlib: error while loading shared libraries:
libz.so.1: cannot open shared object file: No such file or directory
| ./Programs/_freeze_importlib: error while loading shared libraries:
libz.so.1: cannot open shared object file: No such file or directory
Quoted 2 lines
Considering zlib is a DEPENDS I have no idea why this happens. :(
The problem appears to be that _freeze_importlib is a binary compiled and ran at build time but using the target compiler. For you your build environment and the target environment were probably close enough that it works, on some ABs the loader paths are different, and obviously if you build for a different architecture it just fails.
| ./Programs/_freeze_importlib: 1: ./Programs/_freeze_importlib: Syntax
error: word unexpected (expecting ")")
$ file _freeze_importlib _freeze_importlib: ELF 32-bit LSB executable, ARM, EABI5 version 1 (SYSV), dynamically linked, interpreter /lib/ld-linux.so.3, for GNU/Linux 2.6.32, BuildID[sha1]=f5defa61a5f1e65c6be7219dc1bfff59d510cd78, not stripped
Yeah running an ARM binary on x86 isn't going to work.
Ross