diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl/0001-Link-libatomic-on-riscv32.patch | 35 | ||||
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl_3.1.3.bb | 1 |
2 files changed, 36 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl/0001-Link-libatomic-on-riscv32.patch b/meta/recipes-connectivity/openssl/openssl/0001-Link-libatomic-on-riscv32.patch new file mode 100644 index 0000000000..2c54d8f685 --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl/0001-Link-libatomic-on-riscv32.patch | |||
@@ -0,0 +1,35 @@ | |||
1 | From 73266b8573c71e6720453c4c5a9e6e8fa4daec65 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sat, 21 Oct 2023 13:03:52 -0700 | ||
4 | Subject: [PATCH] Link libatomic on riscv32 | ||
5 | |||
6 | GCC toolchains on linux are not able to build libcrypto without linking | ||
7 | to libatomic as it does not have all needed atomics implemented as | ||
8 | intrinsics | ||
9 | |||
10 | Fixes errors like | ||
11 | |||
12 | | ld: ./libcrypto.so: undefined reference to `__atomic_is_lock_free' | ||
13 | |||
14 | Upstream-Status: Submitted [https://github.com/openssl/openssl/pull/22460] | ||
15 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
16 | --- | ||
17 | Configurations/10-main.conf | 2 +- | ||
18 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
19 | |||
20 | diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf | ||
21 | index 46094f59c2..d1a15a1152 100644 | ||
22 | --- a/Configurations/10-main.conf | ||
23 | +++ b/Configurations/10-main.conf | ||
24 | @@ -816,7 +816,7 @@ my %targets = ( | ||
25 | }, | ||
26 | |||
27 | "linux32-riscv32" => { | ||
28 | - inherit_from => [ "linux-generic32"], | ||
29 | + inherit_from => [ "linux-latomic" ], | ||
30 | perlasm_scheme => "linux32", | ||
31 | asm_arch => 'riscv32', | ||
32 | }, | ||
33 | -- | ||
34 | 2.42.0 | ||
35 | |||
diff --git a/meta/recipes-connectivity/openssl/openssl_3.1.3.bb b/meta/recipes-connectivity/openssl/openssl_3.1.3.bb index 9fd8a205c6..f9b750debf 100644 --- a/meta/recipes-connectivity/openssl/openssl_3.1.3.bb +++ b/meta/recipes-connectivity/openssl/openssl_3.1.3.bb | |||
@@ -12,6 +12,7 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ | |||
12 | file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch \ | 12 | file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch \ |
13 | file://0001-Configure-do-not-tweak-mips-cflags.patch \ | 13 | file://0001-Configure-do-not-tweak-mips-cflags.patch \ |
14 | file://fix_random_labels.patch \ | 14 | file://fix_random_labels.patch \ |
15 | file://0001-Link-libatomic-on-riscv32.patch \ | ||
15 | " | 16 | " |
16 | 17 | ||
17 | SRC_URI:append:class-nativesdk = " \ | 18 | SRC_URI:append:class-nativesdk = " \ |