diff options
| author |   Robert Joslyn <robert.joslyn@redrectangle.org> | 2022-07-03 15:26:25 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-07-04 15:13:18 +0100 |
| commit | 991a49672a8c45e319dc9d9b0466cf96725c1363 (patch) | |
| tree | dcba2e9fe90e2ffcabd3ed9ae45626cc20abcefe /meta/recipes-support/curl | |
| parent | ede7ab3bbf87cc7d7e713d435ea8a88035c2e46e (diff) | |
| download | openembedded-core-991a49672a8c45e319dc9d9b0466cf96725c1363.tar.gz | |
curl: Update to 7.84.0
This is a feature and bugfix update. Release notes are available at:
https://curl.se/changes.html#7_84_0
Backport a patch fixing a compile issue where sched.h was not included
on certain platforms.
Signed-off-by: Robert Joslyn <robert.joslyn@redrectangle.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/curl')
| -rw-r--r-- | meta/recipes-support/curl/curl_7.84.0.bb (renamed from meta/recipes-support/curl/curl_7.83.1.bb) | 7 | ||||
| -rw-r--r-- | meta/recipes-support/curl/files/0001-easy_lock.h-include-sched.h-if-available-to-fix-buil.patch | 33 |
2 files changed, 38 insertions, 2 deletions
diff --git a/meta/recipes-support/curl/curl_7.83.1.bb b/meta/recipes-support/curl/curl_7.84.0.bb index 1d9de29a65..74a19d20c9 100644 --- a/meta/recipes-support/curl/curl_7.83.1.bb +++ b/meta/recipes-support/curl/curl_7.84.0.bb @@ -9,8 +9,11 @@ SECTION = "console/network" LICENSE = "MIT-open-group" LIC_FILES_CHKSUM = "file://COPYING;md5=190c514872597083303371684954f238" -SRC_URI = "https://curl.se/download/${BP}.tar.xz" -SRC_URI[sha256sum] = "2cb9c2356e7263a1272fd1435ef7cdebf2cd21400ec287b068396deb705c22c4" +SRC_URI = " \ + https://curl.se/download/${BP}.tar.xz \ + file://0001-easy_lock.h-include-sched.h-if-available-to-fix-buil.patch \ +" +SRC_URI[sha256sum] = "2d118b43f547bfe5bae806d8d47b4e596ea5b25a6c1f080aef49fbcd817c5db8" # Curl has used many names over the years... CVE_PRODUCT = "haxx:curl haxx:libcurl curl:curl curl:libcurl libcurl:libcurl daniel_stenberg:curl" diff --git a/meta/recipes-support/curl/files/0001-easy_lock.h-include-sched.h-if-available-to-fix-buil.patch b/meta/recipes-support/curl/files/0001-easy_lock.h-include-sched.h-if-available-to-fix-buil.patch new file mode 100644 index 0000000000..771bdb2b96 --- /dev/null +++ b/meta/recipes-support/curl/files/0001-easy_lock.h-include-sched.h-if-available-to-fix-buil.patch @@ -0,0 +1,33 @@ +From e2e7f54b7bea521fa8373095d0f43261a720cda0 Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg <daniel@haxx.se> +Date: Mon, 27 Jun 2022 08:46:21 +0200 +Subject: [PATCH] easy_lock.h: include sched.h if available to fix build + +Patched-by: Harry Sintonen + +Closes #9054 + +Upstream-Status: Backport [e2e7f54b7bea521fa8373095d0f43261a720cda0] + +Signed-off-by: Robert Joslyn <robert.joslyn@redrectangle.org> +--- + lib/easy_lock.h | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/lib/easy_lock.h b/lib/easy_lock.h +index 819f50ce8..1f54289ce 100644 +--- a/lib/easy_lock.h ++++ b/lib/easy_lock.h +@@ -36,6 +36,9 @@ + + #elif defined (HAVE_ATOMIC) + #include <stdatomic.h> ++#if defined(HAVE_SCHED_YIELD) ++#include <sched.h> ++#endif + + #define curl_simple_lock atomic_bool + #define CURL_SIMPLE_LOCK_INIT false +-- +2.35.1 + |