diff options
author | Khem Raj <raj.khem@gmail.com> | 2018-09-03 11:16:19 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-09-27 12:17:45 +0100 |
commit | d4234f8a2f6a200d32e5b72e99c9a2305c90f4e4 (patch) | |
tree | 75d2b23a447922f07cfe6b15d1051e9b78e44536 /meta/recipes-support/serf/serf/0004-Follow-up-to-r1811083-fix-building-with-scons-3.0.0-.patch | |
parent | d759a0659b7831e56224aa0c552885b9bda82b93 (diff) | |
download | poky-d4234f8a2f6a200d32e5b72e99c9a2305c90f4e4.tar.gz |
serf: Fix Sconstruct build with python 3.7
These patches will be needed to build serf on hosts with
python 3.7+
(From OE-Core rev: ab0be544b392bbd6cb1dc91edd5fe8563d7de393)
(From OE-Core rev: ffe1795dc6daf9999e1be858a4e97a4c2cf44526)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/serf/serf/0004-Follow-up-to-r1811083-fix-building-with-scons-3.0.0-.patch')
-rw-r--r-- | meta/recipes-support/serf/serf/0004-Follow-up-to-r1811083-fix-building-with-scons-3.0.0-.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/meta/recipes-support/serf/serf/0004-Follow-up-to-r1811083-fix-building-with-scons-3.0.0-.patch b/meta/recipes-support/serf/serf/0004-Follow-up-to-r1811083-fix-building-with-scons-3.0.0-.patch new file mode 100644 index 0000000000..02fa9e3a06 --- /dev/null +++ b/meta/recipes-support/serf/serf/0004-Follow-up-to-r1811083-fix-building-with-scons-3.0.0-.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | From 565211fd082ef653ca9c44a345350fc1451f5a0f Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Mon, 3 Sep 2018 11:12:38 -0700 | ||
4 | Subject: [PATCH] Follow-up to r1811083 fix building with scons 3.0.0 and | ||
5 | Python3 | ||
6 | |||
7 | * SConstruct: Append decode('utf-8) to FILE.get_contents() to avoid | ||
8 | TypeError: cannot use a string pattern on a bytes-like object | ||
9 | |||
10 | Upstream-Status: Backport | ||
11 | [https://svn.apache.org/viewvc/serf/trunk/SConstruct?r1=1811088&r2=1814604] | ||
12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
13 | --- | ||
14 | SConstruct | 2 +- | ||
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
16 | |||
17 | diff --git a/SConstruct b/SConstruct | ||
18 | index 877731e..7678bb1 100644 | ||
19 | --- a/SConstruct | ||
20 | +++ b/SConstruct | ||
21 | @@ -169,7 +169,7 @@ env.Append(BUILDERS = { | ||
22 | match = re.search('SERF_MAJOR_VERSION ([0-9]+).*' | ||
23 | 'SERF_MINOR_VERSION ([0-9]+).*' | ||
24 | 'SERF_PATCH_VERSION ([0-9]+)', | ||
25 | - env.File('serf.h').get_contents(), | ||
26 | + env.File('serf.h').get_contents().decode('utf-8'), | ||
27 | re.DOTALL) | ||
28 | MAJOR, MINOR, PATCH = [int(x) for x in match.groups()] | ||
29 | env.Append(MAJOR=str(MAJOR)) | ||