From 4fe7774f08ba46bd1d68e56eff3f4912db107c25 Mon Sep 17 00:00:00 2001 From: Jose Lamego Date: Thu, 19 Oct 2017 14:28:25 -0500 Subject: python-scons*: upgrade to 3.0.0 Both python-scons and python-scons-native need to be upgraded to latest upstream version. LIC_FILES_CHKSUM changed due to updated year in date, but rest of file remain the same. Following dependencies were added to enable appropriate package usage: python-shell, python-pprint and python-importlib. A patch was taken from upstream to support python2 print statements in SConscripts. This should be included in next version. These changes were tested in qemux86 with core-image-minimal. Signed-off-by: Jose Lamego Signed-off-by: Ross Burton --- .../python/python-scons-native_2.5.1.bb | 8 ----- .../python/python-scons-native_3.0.0.bb | 8 +++++ ...onscript-Support-python2-print-statements.patch | 38 ++++++++++++++++++++++ meta/recipes-devtools/python/python-scons_2.5.1.bb | 23 ------------- meta/recipes-devtools/python/python-scons_3.0.0.bb | 27 +++++++++++++++ 5 files changed, 73 insertions(+), 31 deletions(-) delete mode 100644 meta/recipes-devtools/python/python-scons-native_2.5.1.bb create mode 100644 meta/recipes-devtools/python/python-scons-native_3.0.0.bb create mode 100644 meta/recipes-devtools/python/python-scons/SConscript-Support-python2-print-statements.patch delete mode 100644 meta/recipes-devtools/python/python-scons_2.5.1.bb create mode 100644 meta/recipes-devtools/python/python-scons_3.0.0.bb (limited to 'meta/recipes-devtools/python') diff --git a/meta/recipes-devtools/python/python-scons-native_2.5.1.bb b/meta/recipes-devtools/python/python-scons-native_2.5.1.bb deleted file mode 100644 index dae89ab5d2..0000000000 --- a/meta/recipes-devtools/python/python-scons-native_2.5.1.bb +++ /dev/null @@ -1,8 +0,0 @@ -require python-scons_${PV}.bb -inherit native pythonnative -DEPENDS = "python-native" -RDEPENDS_${PN} = "" - -do_install_append() { - create_wrapper ${D}${bindir}/scons SCONS_LIB_DIR='${STAGING_DIR_HOST}/${PYTHON_SITEPACKAGES_DIR}' -} diff --git a/meta/recipes-devtools/python/python-scons-native_3.0.0.bb b/meta/recipes-devtools/python/python-scons-native_3.0.0.bb new file mode 100644 index 0000000000..dae89ab5d2 --- /dev/null +++ b/meta/recipes-devtools/python/python-scons-native_3.0.0.bb @@ -0,0 +1,8 @@ +require python-scons_${PV}.bb +inherit native pythonnative +DEPENDS = "python-native" +RDEPENDS_${PN} = "" + +do_install_append() { + create_wrapper ${D}${bindir}/scons SCONS_LIB_DIR='${STAGING_DIR_HOST}/${PYTHON_SITEPACKAGES_DIR}' +} diff --git a/meta/recipes-devtools/python/python-scons/SConscript-Support-python2-print-statements.patch b/meta/recipes-devtools/python/python-scons/SConscript-Support-python2-print-statements.patch new file mode 100644 index 0000000000..b1a790219e --- /dev/null +++ b/meta/recipes-devtools/python/python-scons/SConscript-Support-python2-print-statements.patch @@ -0,0 +1,38 @@ +From 885aabdb313685405737112dcb7d7774eee6d879 Mon Sep 17 00:00:00 2001 +From: Thomas Berg +Date: Thu, 19 Oct 2017 14:02:21 -0500 +Subject: [PATCH] SConscript: Support python2 print statements + +This fixes a regression introduced in scons-3.0.0, where +SConscripts containing python 2 print statements would cause +syntax errors even when executing scons with python 2.7. + +This ensures backward compatibility, allowing users to build +legacy code with scons-3.0.0 without having to patch it. + +Taken from +https://github.com/SConsProject/scons/commit/2e0de3c55f22b3eaa7767b69740b898f3d2f46bf + +Upstream-Status: Accepted + +Signed-off-by: Jose Lamego +--- + engine/SCons/Script/SConscript.py | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/engine/SCons/Script/SConscript.py b/engine/SCons/Script/SConscript.py +index bc05540..332d1fa 100644 +--- a/engine/SCons/Script/SConscript.py ++++ b/engine/SCons/Script/SConscript.py +@@ -5,8 +5,6 @@ files. + + """ + +-from __future__ import print_function +- + # + # Copyright (c) 2001 - 2017 The SCons Foundation + # +-- +2.7.4 + diff --git a/meta/recipes-devtools/python/python-scons_2.5.1.bb b/meta/recipes-devtools/python/python-scons_2.5.1.bb deleted file mode 100644 index 3f43856199..0000000000 --- a/meta/recipes-devtools/python/python-scons_2.5.1.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "Software Construction tool (make/autotools replacement)" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3a885dff6d14e4cd876d9008a09a42de" -SRCNAME = "scons" - -SRC_URI = "https://files.pythonhosted.org/packages/source/s/${SRCNAME}/${SRCNAME}-${PV}.tar.gz" - -SRC_URI[md5sum] = "3eac81e5e8206304a9b4683c57665aa4" -SRC_URI[sha256sum] = "c8de85fc02ed1a687b1f2ac791eaa0c1707b4382a204f17d782b5b111b9fdf07" - -UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/SCons/" - -S = "${WORKDIR}/${SRCNAME}-${PV}" - -inherit setuptools - -RDEPENDS_${PN} = "\ - python-fcntl \ - python-io \ - python-json \ - python-subprocess \ - " diff --git a/meta/recipes-devtools/python/python-scons_3.0.0.bb b/meta/recipes-devtools/python/python-scons_3.0.0.bb new file mode 100644 index 0000000000..33bfb45e2e --- /dev/null +++ b/meta/recipes-devtools/python/python-scons_3.0.0.bb @@ -0,0 +1,27 @@ +SUMMARY = "Software Construction tool (make/autotools replacement)" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=46ddf66004e5be5566367cb525a66fc6" +SRCNAME = "scons" + +SRC_URI = "https://files.pythonhosted.org/packages/source/s/${SRCNAME}/${SRCNAME}-${PV}.tar.gz \ + file://SConscript-Support-python2-print-statements.patch" + +SRC_URI[md5sum] = "7ca558edaaa1942fe38f3105ca2400fb" +SRC_URI[sha256sum] = "aa5afb33c2bbd33c311e47e912412195739e9ffb2e933534a31f85fba8f3470e" + +UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/SCons/" + +S = "${WORKDIR}/${SRCNAME}-${PV}" + +inherit setuptools + +RDEPENDS_${PN} = "\ + python-fcntl \ + python-io \ + python-json \ + python-subprocess \ + python-shell \ + python-pprint \ + python-importlib \ + " -- cgit 1.2.3-korg