summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/serf/serf/0004-Follow-up-to-r1811083-fix-building-with-scons-3.0.0-.patch
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2023-06-14 11:29:08 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-06-16 15:40:11 +0100
commit98ed91039a1fe3e2bc9914f283170cf677b1dd2f (patch)
treeed571f7a69fee5abb63594d0d6f7af3b77f7b08f /meta/recipes-support/serf/serf/0004-Follow-up-to-r1811083-fix-building-with-scons-3.0.0-.patch
parent2b9ef6d640f1963bdefec5c7be8c9134adb8fcb4 (diff)
downloadpoky-98ed91039a1fe3e2bc9914f283170cf677b1dd2f.tar.gz
serf: upgrade 1.3.9 -> 1.3.10
As serf is undead, we need to reassess all the remaining patches. (From OE-Core rev: 775cbcc876edcb6c339f342a3253f5afcf6ef163) Signed-off-by: Alexander Kanavin <alex@linutronix.de> 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-.patch29
1 files changed, 0 insertions, 29 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
deleted file mode 100644
index 02fa9e3a06..0000000000
--- a/meta/recipes-support/serf/serf/0004-Follow-up-to-r1811083-fix-building-with-scons-3.0.0-.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1From 565211fd082ef653ca9c44a345350fc1451f5a0f Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 3 Sep 2018 11:12:38 -0700
4Subject: [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
10Upstream-Status: Backport
11[https://svn.apache.org/viewvc/serf/trunk/SConstruct?r1=1811088&r2=1814604]
12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13---
14 SConstruct | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/SConstruct b/SConstruct
18index 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))