* Simplify recipe by using pypi.bbclass * Drop patch for __future__ print_function - fixed upstream: https://github.com/SConsProject/scons/pull/1/commits/4c199d06e76afb9379e76942d0f68caa57f42509
Signed-off-by: Tim Orling <timothy.t.orl...@linux.intel.com> --- ...ative_3.0.0.bb => python-scons-native_3.0.1.bb} | 0 ...onscript-Support-python2-print-statements.patch | 38 ---------------------- ...python-scons_3.0.0.bb => python-scons_3.0.1.bb} | 12 ++----- 3 files changed, 3 insertions(+), 47 deletions(-) rename meta/recipes-devtools/python/{python-scons-native_3.0.0.bb => python-scons-native_3.0.1.bb} (100%) delete mode 100644 meta/recipes-devtools/python/python-scons/SConscript-Support-python2-print-statements.patch rename meta/recipes-devtools/python/{python-scons_3.0.0.bb => python-scons_3.0.1.bb} (54%) diff --git a/meta/recipes-devtools/python/python-scons-native_3.0.0.bb b/meta/recipes-devtools/python/python-scons-native_3.0.1.bb similarity index 100% rename from meta/recipes-devtools/python/python-scons-native_3.0.0.bb rename to meta/recipes-devtools/python/python-scons-native_3.0.1.bb 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 deleted file mode 100644 index b1a790219e..0000000000 --- a/meta/recipes-devtools/python/python-scons/SConscript-Support-python2-print-statements.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 885aabdb313685405737112dcb7d7774eee6d879 Mon Sep 17 00:00:00 2001 -From: Thomas Berg <merlin...@gmail.com> -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 <jose.a.lam...@linux.intel.com> ---- - 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_3.0.0.bb b/meta/recipes-devtools/python/python-scons_3.0.1.bb similarity index 54% rename from meta/recipes-devtools/python/python-scons_3.0.0.bb rename to meta/recipes-devtools/python/python-scons_3.0.1.bb index 8fe74f4b3c..2f75b08d25 100644 --- a/meta/recipes-devtools/python/python-scons_3.0.0.bb +++ b/meta/recipes-devtools/python/python-scons_3.0.1.bb @@ -2,20 +2,14 @@ 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" +SRC_URI[md5sum] = "b6a292e251b34b82c203b56cfa3968b3" +SRC_URI[sha256sum] = "24475e38d39c19683bc88054524df018fe6949d70fbd4c69e298d39a0269f173" UPSTREAM_CHECK_URI = "http://scons.org/pages/download.html" UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar" -S = "${WORKDIR}/${SRCNAME}-${PV}" - -inherit setuptools +inherit pypi setuptools RDEPENDS_${PN} = "\ python-fcntl \ -- 2.14.3 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core