summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorTim Orling <timothy.t.orling@linux.intel.com>2017-11-18 18:28:56 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-12-13 14:00:52 +0000
commitb73e96e7f3f5d1ba3a221d99792a7a3c7ef42c21 (patch)
tree26511020befbc8d0f54de1c031d80b21563fa35b /meta
parent9f8525721672577cbaab96081094211479db4c76 (diff)
downloadpoky-b73e96e7f3f5d1ba3a221d99792a7a3c7ef42c21.tar.gz
python-scons: upgrade to v3.0.1; use pypi.bbclass
* Simplify recipe by using pypi.bbclass * Drop patch for __future__ print_function - fixed upstream: https://github.com/SConsProject/scons/pull/1/commits/4c199d06e76afb9379e76942d0f68caa57f42509 (From OE-Core rev: cf5c44ac611c2c2657e6fd3c1f723bcb20b812dd) Signed-off-by: Tim Orling <timothy.t.orling@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/python/python-scons-native_3.0.1.bb (renamed from meta/recipes-devtools/python/python-scons-native_3.0.0.bb)0
-rw-r--r--meta/recipes-devtools/python/python-scons/SConscript-Support-python2-print-statements.patch38
-rw-r--r--meta/recipes-devtools/python/python-scons_3.0.1.bb (renamed from meta/recipes-devtools/python/python-scons_3.0.0.bb)12
3 files changed, 3 insertions, 47 deletions
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
index dae89ab5d2..dae89ab5d2 100644
--- a/meta/recipes-devtools/python/python-scons-native_3.0.0.bb
+++ b/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 @@
1From 885aabdb313685405737112dcb7d7774eee6d879 Mon Sep 17 00:00:00 2001
2From: Thomas Berg <merlin66b@gmail.com>
3Date: Thu, 19 Oct 2017 14:02:21 -0500
4Subject: [PATCH] SConscript: Support python2 print statements
5
6This fixes a regression introduced in scons-3.0.0, where
7SConscripts containing python 2 print statements would cause
8syntax errors even when executing scons with python 2.7.
9
10This ensures backward compatibility, allowing users to build
11legacy code with scons-3.0.0 without having to patch it.
12
13Taken from
14https://github.com/SConsProject/scons/commit/2e0de3c55f22b3eaa7767b69740b898f3d2f46bf
15
16Upstream-Status: Accepted
17
18Signed-off-by: Jose Lamego <jose.a.lamego@linux.intel.com>
19---
20 engine/SCons/Script/SConscript.py | 2 --
21 1 file changed, 2 deletions(-)
22
23diff --git a/engine/SCons/Script/SConscript.py b/engine/SCons/Script/SConscript.py
24index bc05540..332d1fa 100644
25--- a/engine/SCons/Script/SConscript.py
26+++ b/engine/SCons/Script/SConscript.py
27@@ -5,8 +5,6 @@ files.
28
29 """
30
31-from __future__ import print_function
32-
33 #
34 # Copyright (c) 2001 - 2017 The SCons Foundation
35 #
36--
372.7.4
38
diff --git a/meta/recipes-devtools/python/python-scons_3.0.0.bb b/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)"
2SECTION = "devel/python" 2SECTION = "devel/python"
3LICENSE = "MIT" 3LICENSE = "MIT"
4LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=46ddf66004e5be5566367cb525a66fc6" 4LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=46ddf66004e5be5566367cb525a66fc6"
5SRCNAME = "scons"
6 5
7SRC_URI = "https://files.pythonhosted.org/packages/source/s/${SRCNAME}/${SRCNAME}-${PV}.tar.gz \ 6SRC_URI[md5sum] = "b6a292e251b34b82c203b56cfa3968b3"
8 file://SConscript-Support-python2-print-statements.patch" 7SRC_URI[sha256sum] = "24475e38d39c19683bc88054524df018fe6949d70fbd4c69e298d39a0269f173"
9
10SRC_URI[md5sum] = "7ca558edaaa1942fe38f3105ca2400fb"
11SRC_URI[sha256sum] = "aa5afb33c2bbd33c311e47e912412195739e9ffb2e933534a31f85fba8f3470e"
12 8
13UPSTREAM_CHECK_URI = "http://scons.org/pages/download.html" 9UPSTREAM_CHECK_URI = "http://scons.org/pages/download.html"
14UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar" 10UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar"
15 11
16S = "${WORKDIR}/${SRCNAME}-${PV}" 12inherit pypi setuptools
17
18inherit setuptools
19 13
20RDEPENDS_${PN} = "\ 14RDEPENDS_${PN} = "\
21 python-fcntl \ 15 python-fcntl \