diff options
Diffstat (limited to 'meta/recipes-support/serf')
-rw-r--r-- | meta/recipes-support/serf/serf/0001-Fix-syntax-of-a-print-in-the-scons-file-to-unbreak-b.patch | 29 | ||||
-rw-r--r-- | meta/recipes-support/serf/serf/0004-Follow-up-to-r1811083-fix-building-with-scons-3.0.0-.patch | 29 | ||||
-rw-r--r-- | meta/recipes-support/serf/serf/SConstruct.stop.creating.directories.without.sandbox-install.prefix.patch | 2 | ||||
-rw-r--r-- | meta/recipes-support/serf/serf_1.3.10.bb (renamed from meta/recipes-support/serf/serf_1.3.9.bb) | 12 |
4 files changed, 8 insertions, 64 deletions
diff --git a/meta/recipes-support/serf/serf/0001-Fix-syntax-of-a-print-in-the-scons-file-to-unbreak-b.patch b/meta/recipes-support/serf/serf/0001-Fix-syntax-of-a-print-in-the-scons-file-to-unbreak-b.patch deleted file mode 100644 index 4a5832ac1a..0000000000 --- a/meta/recipes-support/serf/serf/0001-Fix-syntax-of-a-print-in-the-scons-file-to-unbreak-b.patch +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | From 99f6e1b0d68281b63218d6adfe68cd9e331ac5be Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Mon, 3 Sep 2018 10:50:08 -0700 | ||
4 | Subject: [PATCH] Fix syntax of a print() in the scons file to unbreak building | ||
5 | with most recent scons version. | ||
6 | |||
7 | * SConstruct Use Python 3.0 valid syntax to make Scons 3.0.0 happy on both python | ||
8 | 3.0 and 2.7. | ||
9 | |||
10 | Upstream-Status: Backport | ||
11 | [https://svn.apache.org/viewvc/serf/trunk/SConstruct?r1=1809132&r2=1811083&diff_format=h] | ||
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 1670459..18a45fa 100644 | ||
19 | --- a/SConstruct | ||
20 | +++ b/SConstruct | ||
21 | @@ -184,7 +184,7 @@ CALLOUT_OKAY = not (env.GetOption('clean') or env.GetOption('help')) | ||
22 | |||
23 | unknown = opts.UnknownVariables() | ||
24 | if unknown: | ||
25 | - print 'Warning: Used unknown variables:', ', '.join(unknown.keys()) | ||
26 | + print('Warning: Used unknown variables:', ', '.join(unknown.keys())) | ||
27 | |||
28 | apr = str(env['APR']) | ||
29 | apu = str(env['APU']) | ||
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 @@ | |||
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)) | ||
diff --git a/meta/recipes-support/serf/serf/SConstruct.stop.creating.directories.without.sandbox-install.prefix.patch b/meta/recipes-support/serf/serf/SConstruct.stop.creating.directories.without.sandbox-install.prefix.patch index 91640d6044..c8e6eddfec 100644 --- a/meta/recipes-support/serf/serf/SConstruct.stop.creating.directories.without.sandbox-install.prefix.patch +++ b/meta/recipes-support/serf/serf/SConstruct.stop.creating.directories.without.sandbox-install.prefix.patch | |||
@@ -31,7 +31,7 @@ ERROR: scons install execution failed. | |||
31 | and the installed paths (including the paths inside libserf*.pc) | 31 | and the installed paths (including the paths inside libserf*.pc) |
32 | look correct | 32 | look correct |
33 | 33 | ||
34 | Upstream-Status: Pending | 34 | Upstream-Status: Inappropriate [removes block of code rather than fixing the problem in that block] |
35 | 35 | ||
36 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | 36 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
37 | 37 | ||
diff --git a/meta/recipes-support/serf/serf_1.3.9.bb b/meta/recipes-support/serf/serf_1.3.10.bb index 2fbf96f997..c6b51452aa 100644 --- a/meta/recipes-support/serf/serf_1.3.9.bb +++ b/meta/recipes-support/serf/serf_1.3.10.bb | |||
@@ -1,16 +1,18 @@ | |||
1 | SUMMARY = "High-Performance Asynchronous HTTP Client Library" | 1 | SUMMARY = "High-Performance Asynchronous HTTP Client Library" |
2 | DESCRIPTION = "The Apache Serf library is a C-based HTTP client library built upon the Apache \ | ||
3 | Portable Runtime (APR) library. It multiplexes connections, running the \ | ||
4 | read/write communication asynchronously. Memory copies and transformations are \ | ||
5 | kept to a minimum to provide high performance operation." | ||
6 | HOMEPAGE = "http://serf.apache.org/" | ||
2 | SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ | 7 | SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ |
3 | file://norpath.patch \ | 8 | file://norpath.patch \ |
4 | file://env.patch \ | 9 | file://env.patch \ |
5 | file://0001-Fix-syntax-of-a-print-in-the-scons-file-to-unbreak-b.patch \ | ||
6 | file://0002-SConstruct-Fix-path-quoting-for-.def-generator.patch \ | 10 | file://0002-SConstruct-Fix-path-quoting-for-.def-generator.patch \ |
7 | file://0003-gen_def.patch \ | 11 | file://0003-gen_def.patch \ |
8 | file://0004-Follow-up-to-r1811083-fix-building-with-scons-3.0.0-.patch \ | ||
9 | file://SConstruct.stop.creating.directories.without.sandbox-install.prefix.patch \ | 12 | file://SConstruct.stop.creating.directories.without.sandbox-install.prefix.patch \ |
10 | " | 13 | " |
11 | 14 | ||
12 | SRC_URI[md5sum] = "370a6340ff20366ab088012cd13f2b57" | 15 | SRC_URI[sha256sum] = "be81ef08baa2516ecda76a77adf7def7bc3227eeb578b9a33b45f7b41dc064e6" |
13 | SRC_URI[sha256sum] = "549c2d21c577a8a9c0450facb5cca809f26591f048e466552240947bdf7a87cc" | ||
14 | 16 | ||
15 | LICENSE = "Apache-2.0" | 17 | LICENSE = "Apache-2.0" |
16 | LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" | 18 | LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" |
@@ -31,7 +33,7 @@ EXTRA_OESCONS = " \ | |||
31 | " | 33 | " |
32 | 34 | ||
33 | # scons creates non-reproducible archives | 35 | # scons creates non-reproducible archives |
34 | do_install_append() { | 36 | do_install:append() { |
35 | rm ${D}/${libdir}/*.a | 37 | rm ${D}/${libdir}/*.a |
36 | } | 38 | } |
37 | 39 | ||