diff options
author | He Zhe <zhe.he@windriver.com> | 2022-07-12 15:47:57 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-07-12 23:56:10 +0100 |
commit | 3a5b5bc97769d543ff98db9ddad5cca616741e84 (patch) | |
tree | f7d9c6602e8282bce99d6ee590d95d16065d52bc /meta/recipes-support/curl | |
parent | fcc6a89dcb0b6afdf85f8af29c620916ae9a8a00 (diff) | |
download | poky-3a5b5bc97769d543ff98db9ddad5cca616741e84.tar.gz |
curl: Fix build failure for qemuriscv64
Backport a patch from upstream to fix the following build failure.
tmp-glibc/work/riscv64-wrs-linux/curl/7.84.0-r0/recipe-sysroot-native/
usr/bin/riscv64-wrs-linux/../../libexec/riscv64-wrs-linux/gcc/
riscv64-wrs-linux/12.1.0/ld: ../lib/.libs/libcurl.so:
undefined reference to `__atomic_exchange_1'
collect2: error: ld returned 1 exit status
(From OE-Core rev: 13d2bf6a34f4182c5c8bdd280d1ffd4caac3844a)
Signed-off-by: He Zhe <zhe.he@windriver.com>
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 | 1 | ||||
-rw-r--r-- | meta/recipes-support/curl/files/0001-easy_lock-switch-to-using-atomic_int-instead-of-bool.patch | 37 |
2 files changed, 38 insertions, 0 deletions
diff --git a/meta/recipes-support/curl/curl_7.84.0.bb b/meta/recipes-support/curl/curl_7.84.0.bb index 0d829cdf23..28b09ef017 100644 --- a/meta/recipes-support/curl/curl_7.84.0.bb +++ b/meta/recipes-support/curl/curl_7.84.0.bb | |||
@@ -12,6 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=190c514872597083303371684954f238" | |||
12 | SRC_URI = " \ | 12 | SRC_URI = " \ |
13 | https://curl.se/download/${BP}.tar.xz \ | 13 | https://curl.se/download/${BP}.tar.xz \ |
14 | file://0001-easy_lock.h-include-sched.h-if-available-to-fix-buil.patch \ | 14 | file://0001-easy_lock.h-include-sched.h-if-available-to-fix-buil.patch \ |
15 | file://0001-easy_lock-switch-to-using-atomic_int-instead-of-bool.patch \ | ||
15 | file://run-ptest \ | 16 | file://run-ptest \ |
16 | file://disable-tests \ | 17 | file://disable-tests \ |
17 | " | 18 | " |
diff --git a/meta/recipes-support/curl/files/0001-easy_lock-switch-to-using-atomic_int-instead-of-bool.patch b/meta/recipes-support/curl/files/0001-easy_lock-switch-to-using-atomic_int-instead-of-bool.patch new file mode 100644 index 0000000000..878839a5e3 --- /dev/null +++ b/meta/recipes-support/curl/files/0001-easy_lock-switch-to-using-atomic_int-instead-of-bool.patch | |||
@@ -0,0 +1,37 @@ | |||
1 | From 50efb0822aa0e0ab165158dd0a26e65a2290e6d2 Mon Sep 17 00:00:00 2001 | ||
2 | From: Daniel Stenberg <daniel@haxx.se> | ||
3 | Date: Tue, 28 Jun 2022 09:00:25 +0200 | ||
4 | Subject: [PATCH] easy_lock: switch to using atomic_int instead of bool | ||
5 | |||
6 | To work with more compilers without requiring separate libs to | ||
7 | link. Like with gcc-12 for RISC-V on Linux. | ||
8 | |||
9 | Reported-by: Adam Sampson | ||
10 | Fixes #9055 | ||
11 | Closes #9061 | ||
12 | |||
13 | Upstream-Status: Backport [50efb0822aa0e0ab165158dd0a26e65a2290e6d2] | ||
14 | |||
15 | Signed-off-by: He Zhe <zhe.he@windriver.com> | ||
16 | --- | ||
17 | lib/easy_lock.h | 4 ++-- | ||
18 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
19 | |||
20 | diff --git a/lib/easy_lock.h b/lib/easy_lock.h | ||
21 | index 07c85c5ff..9c11bc50c 100644 | ||
22 | --- a/lib/easy_lock.h | ||
23 | +++ b/lib/easy_lock.h | ||
24 | @@ -40,8 +40,8 @@ | ||
25 | #include <sched.h> | ||
26 | #endif | ||
27 | |||
28 | -#define curl_simple_lock atomic_bool | ||
29 | -#define CURL_SIMPLE_LOCK_INIT false | ||
30 | +#define curl_simple_lock atomic_int | ||
31 | +#define CURL_SIMPLE_LOCK_INIT 0 | ||
32 | |||
33 | static inline void curl_simple_lock_lock(curl_simple_lock *lock) | ||
34 | { | ||
35 | -- | ||
36 | 2.25.1 | ||
37 | |||