python 3.4.2 patch

PATCH Artur Wroblewski 2 participants 3 messages Nov 3, 2014 – Nov 5, 2014

lore

Share & tools

lore

Artur Wroblewski

author

2014-11-03 23:59 UTC #0 lore raw

Hi,

As advised at

    https://bugzilla.yoctoproject.org/show_bug.cgi?id=6857

I am attaching a patch to replace Python 3.3.x with Python 3.4.2. This also fixes issue with missing basic Python 3.x modules, see

    https://bugzilla.yoctoproject.org/show_bug.cgi?id=6831

Build tested with git master:

    $ tar tvjf tmp/deploy/images/qemux86/core-image-minimal-qemux86.tar.bz2 | grep python3.4 | wc -l
    2028

Regards,

documentation/ref-manual/ref-variables.xml +1 -1

index b22c661..ab9ee13 100644
@@ -6953,7 +6953,7 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
                     The OpenEmbedded build system uses the ABI to construct
                     directory names used when installing the Python headers
                     and libraries in sysroot
-                    (e.g. <filename>.../python3.3m/...</filename>).
+                    (e.g. <filename>.../python3.4m/...</filename>).
                 </para>
 
                 <para>

meta/classes/distutils3-base.bbclass +1 -1

index d4d25dc..af3aa00 100644
@@ -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.3"
+PYTHON_BASEVERSION = "3.4"
 PYTHON_ABI = "m"
 
 inherit distutils-common-base python3native

meta/classes/distutils3-native-base.bbclass +1 -1

index ed3fe54..1117101 100644
@@ -1,4 +1,4 @@
-PYTHON_BASEVERSION = "3.3"
+PYTHON_BASEVERSION = "3.4"
 PYTHON_ABI = "m"
 
 inherit distutils-native-base

meta/classes/python3native.bbclass +1 -1

index f86374f..cf83017 100644
@@ -1,4 +1,4 @@
-PYTHON_BASEVERSION = "3.3"
+PYTHON_BASEVERSION = "3.4"
 
 inherit python-dir

meta/recipes-devtools/python/python-3.4-manifest.inc +71 ~~-71~~

334 lines not on this page · raw message

meta/recipes-devtools/python/python3-native_3.4.2.bb +14 ~~-20~~

index 9ae2a0b..9f124a4 100644
@@ -1,37 +1,29 @@
 require recipes-devtools/python/python.inc
 
 PR = "${INC_PR}.0"
-PYTHON_MAJMIN = "3.3"
+PYTHON_MAJMIN = "3.4"
 DISTRO_SRC_URI ?= "file://sitecustomize.py"
 DISTRO_SRC_URI_linuxstdbase = ""
-SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \
+SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \
 file://12-distutils-prefix-is-inside-staging-area.patch \
 file://python-config.patch \
 file://000-cross-compile.patch \
-file://020-dont-compile-python-files.patch \
 file://030-fixup-include-dirs.patch \
-file://070-dont-clean-ipkg-install.patch \
-file://080-distutils-dont_adjust_files.patch \
-file://110-enable-zlib.patch \
-file://130-readline-setup.patch \
-file://150-fix-setupterm.patch \
-file://python-3.3-multilib.patch \
-file://03-fix-tkinter-detection.patch \
-file://avoid_warning_about_tkinter.patch \
-file://06-ctypes-libffi-fix-configure.patch \
-file://shutil-follow-symlink-fix.patch \
 file://0001-h2py-Fix-issue-13032-where-it-fails-with-UnicodeDeco.patch \
+file://host_include_contamination.patch \
+file://avoid-ncursesw-include-path.patch \
+file://python-3.4-multilib.patch \
+file://06-ctypes-libffi-fix-configure.patch \
 file://sysroot-include-headers.patch \
 file://unixccompiler.patch \
-file://fix-ast.h-dependency.patch \
 file://makerace.patch \
-${DISTRO_SRC_URI} \
-file://python3-fix-build-error-with-Readline-6.3.patch \
+file://03-fix-tkinter-detection.patch \
+file://python-debug.patch \
 "
-SRC_URI[md5sum] = "f3ebe34d4d8695bf889279b54673e10c"
-SRC_URI[sha256sum] = "e526e9b612f623888364d30cc9f3dfc34dcef39065c713bdbcddf47df84d8dcb"
+SRC_URI[md5sum] = "36fc7327c02c6f12fa24fc9ba78039e3"
+SRC_URI[sha256sum] = "1c6d9682d145c056537e477bbfa060ce727f9edd38df1827e0f970dcf04b2def"
 
-LIC_FILES_CHKSUM = "file://LICENSE;md5=4eaea08eaaf6875189b0c49f26fa2005"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=64fc2b30b67d0a8423c250e0386ed72f"
 
 S = "${WORKDIR}/Python-${PV}"

@@ -40,6 +32,8 @@ DEPENDS = "openssl-native bzip2-replacement-native zlib-native readline-native s
 
 inherit native
 
+CONFIGUREOPTS += " --without-pydebug --without-ensurepip"
+
 RPROVIDES += "python3-distutils-native python3-compression-native python3-textutils-native python3-core-native"
 
 EXTRA_OECONF_append = " --bindir=${bindir}/${PN}"

@@ -57,7 +51,7 @@ EXTRA_OEMAKE = '\
 # No ctypes option for python 3
 PYTHONLSBOPTS = ""
 
-do_configure_prepend() {
+do_configure_append() {
 	autoreconf --verbose --install --force --exclude=autopoint Modules/_ctypes/libffi || bbnote "_ctypes failed to autoreconf"
 }

meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch +6 ~~-23~~

index c5846a5..3cba081 100644
@@ -1,14 +1,6 @@
-Upstream-Status: Inappropriate [embedded specific]
-
-# The proper prefix is inside our staging area.
-# Signed-Off: Michael 'Mickey' Lauer <[email protected]>
-# Signed-off-by: Phil Blundell <[email protected]>
-# Signed-off-by: Khem Raj <[email protected]>
-
-Index: Python-3.3.2/Lib/distutils/sysconfig.py
-===================================================================
---- Python-3.3.2.orig/Lib/distutils/sysconfig.py	2013-07-30 00:00:52.769749805 -0700
-+++ Python-3.3.2/Lib/distutils/sysconfig.py	2013-07-30 00:16:22.545767248 -0700
+diff -Nur Python-3.4.2.orig/Lib/distutils/sysconfig.py Python-3.4.2/Lib/distutils/sysconfig.py
+--- Python-3.4.2.orig/Lib/distutils/sysconfig.py	2014-10-08 09:18:12.000000000 +0100
++++ Python-3.4.2/Lib/distutils/sysconfig.py	2014-10-23 12:26:27.409663674 +0100
 @@ -16,10 +16,11 @@
  from .errors import DistutilsPlatformError

@@ -36,7 +28,7 @@ Index: Python-3.3.2/Lib/distutils/sysconfig.py
          prefix = plat_specific and BASE_EXEC_PREFIX or BASE_PREFIX
      if os.name == "posix":
          if python_build:
-@@ -136,6 +139,12 @@
+@@ -134,6 +137,12 @@
      If 'prefix' is supplied, use it instead of sys.base_prefix or
      sys.base_exec_prefix -- i.e., ignore 'plat_specific'.
      """

@@ -49,7 +41,7 @@ Index: Python-3.3.2/Lib/distutils/sysconfig.py
      if prefix is None:
          if standard_lib:
              prefix = plat_specific and BASE_EXEC_PREFIX or BASE_PREFIX
-@@ -144,7 +153,7 @@
+@@ -142,7 +151,7 @@
  
      if os.name == "posix":
          libpython = os.path.join(prefix,

@@ -58,16 +50,7 @@ Index: Python-3.3.2/Lib/distutils/sysconfig.py
          if standard_lib:
              return libpython
          else:
-@@ -249,7 +258,7 @@
-     else:
-         # The name of the config.h file changed in 2.2
-         config_h = 'pyconfig.h'
--    return os.path.join(inc_dir, config_h)
-+    return os.path.join(inc_dir, config_h).replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") )
- 
- 
- def get_makefile_filename():
-@@ -258,7 +267,7 @@
+@@ -251,7 +260,7 @@
          return os.path.join(_sys_home or project_base, "Makefile")
      lib_dir = get_python_lib(plat_specific=0, standard_lib=1)
      config_file = 'config-{}{}'.format(get_python_version(), build_flags)

meta/recipes-devtools/python/python3/avoid-ncursesw-include-path.patch +7 ~~-25~~

index 054a131..cf3a0da 100644
@@ -1,29 +1,11 @@
-We should make sure that sysroot is used by gcc instead of assuming
-hardcoded locations for include paths
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <[email protected]>
-:
-Index: Python-3.3.3/configure.ac
-===================================================================
---- Python-3.3.3.orig/configure.ac	2014-01-29 19:00:15.245312752 -0800
-+++ Python-3.3.3/configure.ac	2014-01-29 23:27:22.938526262 -0800
-@@ -1548,7 +1548,7 @@
- # checks for header files
- AC_HEADER_STDC
- ac_save_cppflags="$CPPFLAGS"
--CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw"
-+CPPFLAGS="$CPPFLAGS -I=/usr/include/ncursesw"
- AC_CHECK_HEADERS(asm/types.h conio.h curses.h direct.h dlfcn.h errno.h \
- fcntl.h grp.h \
- ieeefp.h io.h langinfo.h libintl.h ncurses.h process.h pthread.h \
-@@ -4308,7 +4308,7 @@
- fi
+--- Python-3.4.2/configure.ac.orig	2014-10-17 21:58:13.967488345 +0100
++++ Python-3.4.2/configure.ac	2014-10-17 21:59:01.231689639 +0100
+@@ -4399,7 +4399,7 @@
  
+ # first curses header check
  ac_save_cppflags="$CPPFLAGS"
 -CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw"
 +CPPFLAGS="$CPPFLAGS -I=/usr/include/ncursesw"
- # On HP/UX 11.0, mvwdelch is a block with a return statement
- AC_MSG_CHECKING(whether mvwdelch is an expression)
- AC_CACHE_VAL(ac_cv_mvwdelch_is_expression,
+ 
+ AC_CHECK_HEADERS(curses.h ncurses.h)
+

meta/recipes-devtools/python/python3/makerace.patch +0 -2

index d8a6892..62d7de1 100644
@@ -11,8 +11,6 @@ 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

meta/recipes-devtools/python/python3/python-3.4-multilib.patch +144 ~~-163~~

406 lines not on this page · raw message

meta/recipes-devtools/python/python3/unixccompiler.patch +1 -3

index 7b90f13..b2229b4 100644
@@ -13,13 +13,11 @@ Index: Python-3.3.2/Lib/distutils/unixccompiler.py
 ===================================================================
 --- Python-3.3.2.orig/Lib/distutils/unixccompiler.py	2013-05-15 09:32:54.000000000 -0700
 +++ Python-3.3.2/Lib/distutils/unixccompiler.py	2013-08-01 00:58:18.629056286 -0700
-@@ -202,7 +202,9 @@
+@@ -202,7 +202,7 @@
      # ccompiler.py.
  
      def library_dir_option(self, dir):
 -        return "-L" + dir
-+        if dir.startswith("."):
-+            return "-L" + dir
 +        return "-L=" + dir
  
      def _is_gcc(self, compiler_name):

meta/recipes-devtools/python/python3_3.4.2.bb +15 ~~-35~~

79 lines not on this page · raw message

scripts/contrib/python/generate-manifest-3.4.py +37 ~~-19~~

122 lines not on this page · raw message

Your patch needs a Signed-off-by: tag and alittle more explaination in the commit message as to what you did (removed patches, rebased patches, ...), It's also important to note why the LIC_FILES_CHKSUM changed, it might be as simple as version or date changes, but we need to flag them in case the actual License changed.

Would it make sense to use a PYTHON_MAJMIN in the manifest generator instead of hardcoding the python version? This would allow for the manifest.inc changeset to be much smaller.

Sau!

Artur Wroblewski

author

2014-11-05 21:57 UTC #2 lore raw

Quoted 27 lines · Saul Wold

Quoted 15 lines · Artur Wroblewski
Hi,
As advised at
     https://bugzilla.yoctoproject.org/show_bug.cgi?id=6857
I am attaching a patch to replace Python 3.3.x with Python 3.4.2. This also
fixes issue with missing basic Python 3.x modules, see
     https://bugzilla.yoctoproject.org/show_bug.cgi?id=6831
Build tested with git master:
Quoted 11 lines
     $ tar tvjf
tmp/deploy/images/qemux86/core-image-minimal-qemux86.tar.bz2 | grep
python3.4 | wc -l
     2028
Regards,
w

Quoted 7 lines

Thanks for working up the patch.
Your patch needs a Signed-off-by: tag and alittle more explaination in the commit message as to what you did (removed patches, rebased patches, ...), It's also important to note why the LIC_FILES_CHKSUM changed, it might be as simple as version or date changes, but we need to flag them in case the actual License changed.

Will do.

Quoted 3 lines

Would it make sense to use a PYTHON_MAJMIN in the manifest generator instead of hardcoding the python version? This would allow for the manifest.inc changeset to be much smaller.

Probably. But I would prefer to minimize the first patch as much as possible. I understand
that the faster the good quality of Python 3 is achieved the better, but I would prefer
to do that in several, smaller and hopefully more manageable steps. At the moment
Python 3.3.3 in Yocto simply does not run (looks like just copy from Python 2.x just to
make it compile), so I think you can cut me some slack here as my patch makes Python 3 run in Yocto. On my side I promise more patches in near future, i.e. more
SRC_URI patches need review, pip integration would be nice and some of the modules
like decimal need additional work.

Regards,