diff options
| -rw-r--r-- | meta-oe/recipes-support/cpprest/cpprest-2.10.5/747.patch | 13 | ||||
| -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 81a76ea9fc..0000000000 --- a/meta-oe/recipes-support/cpprest/cpprest-2.10.5/747.patch +++ /dev/null | |||
| @@ -1,13 +0,0 @@ | |||
| 1 | Description: fix for upstream issue 747, clang 6 build error | ||
| 2 | Forwarded: https://github.com/Microsoft/cpprestsdk/pull/844 | ||
| 3 | From: 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 8a349aef78..8a349aef78 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 75f74ec658..75f74ec658 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 b9b3591c3a..b9b3591c3a 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 93c3e8a269..93c3e8a269 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 040c43ff0e..a3162bb433 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 |
| 17 | SRCREV= "25d6b26f7038eeec3b51e2e0a70960a8e34fcd68" | 16 | SRCREV= "66e50f02dde92f802bbd3a8d79c6352954665b9b" |
| 18 | 17 | ||
| 19 | S = "${WORKDIR}/git" | 18 | S = "${WORKDIR}/git" |
| 20 | 19 | ||
