diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-07-09 15:43:36 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-07-09 15:43:36 +0100 |
| commit | 2719f73b6813d11d13a9650cdd2ab8ec6e69385d (patch) | |
| tree | 8c816148bcbd22757d892089c989ae614eae4f5a /net-misc/curl/files | |
| parent | 0f558761aa2dee1017b4751e4017205e015a9560 (diff) | |
gentoo resync : 09.07.2022
Diffstat (limited to 'net-misc/curl/files')
| -rw-r--r-- | net-misc/curl/files/curl-7.84.0-easylock.patch | 30 | ||||
| -rw-r--r-- | net-misc/curl/files/curl-7.84.0-include-sched.patch | 24 |
2 files changed, 54 insertions, 0 deletions
diff --git a/net-misc/curl/files/curl-7.84.0-easylock.patch b/net-misc/curl/files/curl-7.84.0-easylock.patch new file mode 100644 index 000000000000..77ee610fc117 --- /dev/null +++ b/net-misc/curl/files/curl-7.84.0-easylock.patch @@ -0,0 +1,30 @@ +From 50efb0822aa0e0ab165158dd0a26e65a2290e6d2 Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg <daniel@haxx.se> +Date: Tue, 28 Jun 2022 09:00:25 +0200 +Subject: [PATCH] easy_lock: switch to using atomic_int instead of bool + +To work with more compilers without requiring separate libs to +link. Like with gcc-12 for RISC-V on Linux. + +Reported-by: Adam Sampson +Fixes #9055 +Closes #9061 +--- + lib/easy_lock.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lib/easy_lock.h b/lib/easy_lock.h +index 07c85c5ffdd19..9c11bc50c5f20 100644 +--- a/lib/easy_lock.h ++++ b/lib/easy_lock.h +@@ -40,8 +40,8 @@ + #include <sched.h> + #endif + +-#define curl_simple_lock atomic_bool +-#define CURL_SIMPLE_LOCK_INIT false ++#define curl_simple_lock atomic_int ++#define CURL_SIMPLE_LOCK_INIT 0 + + static inline void curl_simple_lock_lock(curl_simple_lock *lock) + { diff --git a/net-misc/curl/files/curl-7.84.0-include-sched.patch b/net-misc/curl/files/curl-7.84.0-include-sched.patch new file mode 100644 index 000000000000..842310d2eaab --- /dev/null +++ b/net-misc/curl/files/curl-7.84.0-include-sched.patch @@ -0,0 +1,24 @@ +https://github.com/curl/curl/commit/e2e7f54b7bea521fa8373095d0f43261a720cda0 +https://bugs.gentoo.org/855710 + +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 +--- 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 + |