diff options
| author | eugeneswalker <38933153+eugeneswalker@users.noreply.github.com> | 2022-08-06 09:13:12 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-06 18:13:12 +0200 |
| commit | 0efadcae16f24eaab28cd3f7a557e653140bd555 (patch) | |
| tree | 336aed3993ddc1f67970d8d08b41cc47e1da52ac | |
| parent | 7966e9bfb6141dba9e7c0bd0828032686d5b2428 (diff) | |
| download | spack-0efadcae16f24eaab28cd3f7a557e653140bd555.tar.gz spack-0efadcae16f24eaab28cd3f7a557e653140bd555.tar.bz2 spack-0efadcae16f24eaab28cd3f7a557e653140bd555.tar.xz spack-0efadcae16f24eaab28cd3f7a557e653140bd555.zip | |
curl@7.84.0: patch easy_lock.h (https://github.com/curl/curl/pull/9054) (#31950)
| -rw-r--r-- | var/spack/repos/builtin/packages/curl/easy-lock-sched-header.patch | 26 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/curl/package.py | 3 |
2 files changed, 29 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/curl/easy-lock-sched-header.patch b/var/spack/repos/builtin/packages/curl/easy-lock-sched-header.patch new file mode 100644 index 0000000000..33f08fa42f --- /dev/null +++ b/var/spack/repos/builtin/packages/curl/easy-lock-sched-header.patch @@ -0,0 +1,26 @@ +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 +--- + lib/easy_lock.h | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/lib/easy_lock.h b/lib/easy_lock.h +index 819f50ce815b8..1f54289ceb2d3 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 diff --git a/var/spack/repos/builtin/packages/curl/package.py b/var/spack/repos/builtin/packages/curl/package.py index 437209d782..ba9b975aa1 100644 --- a/var/spack/repos/builtin/packages/curl/package.py +++ b/var/spack/repos/builtin/packages/curl/package.py @@ -120,6 +120,9 @@ class Curl(AutotoolsPackage): # curl queries pkgconfig for openssl compilation flags depends_on("pkgconfig", type="build") + # https://github.com/curl/curl/pull/9054 + patch("easy-lock-sched-header.patch", when="@7.84.0") + @classmethod def determine_version(cls, exe): curl = Executable(exe) |