summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGianfranco Costamagna <costamagna.gianfranco@gmail.com>2018-09-10 17:54:17 +0200
committerKhem Raj <raj.khem@gmail.com>2018-09-10 08:56:40 -0700
commitb336c4ab233c917c8be66e9281605caa43dcc486 (patch)
treef5c7a9aa3f6eab3b7591471140a855e674fb49f0
parent99c7136fbd315644855f60581ec1f9505484ecd6 (diff)
downloadmeta-openembedded-b336c4ab233c917c8be66e9281605caa43dcc486.tar.gz
cpprest: bump version to 2.10.6, drop clang 747 patch: upstream
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-support/cpprest/cpprest-2.10.5/747.patch13
-rw-r--r--meta-oe/recipes-support/cpprest/cpprest/845.patch (renamed from meta-oe/recipes-support/cpprest/cpprest-2.10.5/845.patch)0
-rw-r--r--meta-oe/recipes-support/cpprest/cpprest/disable-float-tests.patch (renamed from meta-oe/recipes-support/cpprest/cpprest-2.10.5/disable-float-tests.patch)0
-rw-r--r--meta-oe/recipes-support/cpprest/cpprest/disable-outside-tests.patch (renamed from meta-oe/recipes-support/cpprest/cpprest-2.10.5/disable-outside-tests.patch)0
-rw-r--r--meta-oe/recipes-support/cpprest/cpprest/disable-test-timeouts.patch (renamed from meta-oe/recipes-support/cpprest/cpprest-2.10.5/disable-test-timeouts.patch)0
-rw-r--r--meta-oe/recipes-support/cpprest/cpprest_2.10.6.bb (renamed from meta-oe/recipes-support/cpprest/cpprest_2.10.5.bb)5
6 files changed, 2 insertions, 16 deletions
diff --git a/meta-oe/recipes-support/cpprest/cpprest-2.10.5/747.patch b/meta-oe/recipes-support/cpprest/cpprest-2.10.5/747.patch
deleted file mode 100644
index 81a76ea9f..000000000
--- a/meta-oe/recipes-support/cpprest/cpprest-2.10.5/747.patch
+++ /dev/null
@@ -1,13 +0,0 @@
1Description: fix for upstream issue 747, clang 6 build error
2Forwarded: https://github.com/Microsoft/cpprestsdk/pull/844
3From: rozhuk-im
4--- a/Release/include/pplx/pplxlinux.h 2018-04-29 16:22:39.927675000 +0300
5+++ b/Release/include/pplx/pplxlinux.h 2018-04-29 16:22:57.809537000 +0300
6@@ -240,6 +240,7 @@
7 {
8 public:
9 _PPLXIMP virtual void schedule( TaskProc_t proc, _In_ void* param);
10+ virtual ~linux_scheduler() {}
11 };
12
13 } // namespace details
diff --git a/meta-oe/recipes-support/cpprest/cpprest-2.10.5/845.patch b/meta-oe/recipes-support/cpprest/cpprest/845.patch
index 8a349aef7..8a349aef7 100644
--- a/meta-oe/recipes-support/cpprest/cpprest-2.10.5/845.patch
+++ b/meta-oe/recipes-support/cpprest/cpprest/845.patch
diff --git a/meta-oe/recipes-support/cpprest/cpprest-2.10.5/disable-float-tests.patch b/meta-oe/recipes-support/cpprest/cpprest/disable-float-tests.patch
index 75f74ec65..75f74ec65 100644
--- a/meta-oe/recipes-support/cpprest/cpprest-2.10.5/disable-float-tests.patch
+++ b/meta-oe/recipes-support/cpprest/cpprest/disable-float-tests.patch
diff --git a/meta-oe/recipes-support/cpprest/cpprest-2.10.5/disable-outside-tests.patch b/meta-oe/recipes-support/cpprest/cpprest/disable-outside-tests.patch
index b9b3591c3..b9b3591c3 100644
--- a/meta-oe/recipes-support/cpprest/cpprest-2.10.5/disable-outside-tests.patch
+++ b/meta-oe/recipes-support/cpprest/cpprest/disable-outside-tests.patch
diff --git a/meta-oe/recipes-support/cpprest/cpprest-2.10.5/disable-test-timeouts.patch b/meta-oe/recipes-support/cpprest/cpprest/disable-test-timeouts.patch
index 93c3e8a26..93c3e8a26 100644
--- a/meta-oe/recipes-support/cpprest/cpprest-2.10.5/disable-test-timeouts.patch
+++ b/meta-oe/recipes-support/cpprest/cpprest/disable-test-timeouts.patch
diff --git a/meta-oe/recipes-support/cpprest/cpprest_2.10.5.bb b/meta-oe/recipes-support/cpprest/cpprest_2.10.6.bb
index 040c43ff0..a3162bb43 100644
--- a/meta-oe/recipes-support/cpprest/cpprest_2.10.5.bb
+++ b/meta-oe/recipes-support/cpprest/cpprest_2.10.6.bb
@@ -9,12 +9,11 @@ SRC_URI = "git://github.com/Microsoft/cpprestsdk.git;protocol=https;branch=maste
9 file://disable-outside-tests.patch \ 9 file://disable-outside-tests.patch \
10 file://disable-test-timeouts.patch \ 10 file://disable-test-timeouts.patch \
11 file://disable-float-tests.patch \ 11 file://disable-float-tests.patch \
12 file://747.patch \
13 file://845.patch \ 12 file://845.patch \
14 " 13 "
15 14
16# tag 2.10.5 15# tag 2.10.6
17SRCREV= "25d6b26f7038eeec3b51e2e0a70960a8e34fcd68" 16SRCREV= "66e50f02dde92f802bbd3a8d79c6352954665b9b"
18 17
19S = "${WORKDIR}/git" 18S = "${WORKDIR}/git"
20 19