[Buildroot] [git commit] package/libopenssl: fix libatomic dependency for x86 builds
Thomas Petazzoni
thomas.petazzoni at bootlin.com
Fri Jul 28 19:22:03 UTC 2023
commit: https://git.buildroot.net/buildroot/commit/?id=0ba58baca6f7077cd163ebccab9b37cd65c74e53
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Fixes:
autobuild.buildroot.net/results/ba9/ba926fc27cf3d97274729b3ec1cadb3229bd3af3/
Signed-off-by: Bernd Kuhls <bernd at kuhls.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni at bootlin.com>
---
.../0006-Add-linux-x86-latomic-target.patch | 30 ++++++++++++++++++++++
package/libopenssl/Config.in | 3 ++-
2 files changed, 32 insertions(+), 1 deletion(-)
diff --git a/package/libopenssl/0006-Add-linux-x86-latomic-target.patch b/package/libopenssl/0006-Add-linux-x86-latomic-target.patch
new file mode 100644
index 0000000000..f47eb1d268
--- /dev/null
+++ b/package/libopenssl/0006-Add-linux-x86-latomic-target.patch
@@ -0,0 +1,30 @@
+From c80a60dca209813c33ab3d2794bc32d84c12d033 Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <bernd at kuhls.net>
+Date: Fri, 28 Jul 2023 17:11:25 +0200
+Subject: [PATCH 1/1] Add linux-x86-latomic target
+
+Upstream: https://github.com/openssl/openssl/pull/21590
+
+Signed-off-by: Bernd Kuhls <bernd at kuhls.net>
+---
+ Configurations/10-main.conf | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
+index 2200a85b16..bcf54a2a53 100644
+--- a/Configurations/10-main.conf
++++ b/Configurations/10-main.conf
+@@ -861,6 +861,10 @@ my %targets = (
+ asm_arch => 'x86',
+ perlasm_scheme => "elf",
+ },
++ "linux-x86-latomic" => {
++ inherit_from => [ "linux-x86" ],
++ ex_libs => add(threads("-latomic")),
++ },
+ "linux-x86-clang" => {
+ inherit_from => [ "linux-x86" ],
+ CC => "clang",
+--
+2.39.2
+
diff --git a/package/libopenssl/Config.in b/package/libopenssl/Config.in
index fdfa135f52..3199de8cfe 100644
--- a/package/libopenssl/Config.in
+++ b/package/libopenssl/Config.in
@@ -20,7 +20,8 @@ config BR2_PACKAGE_LIBOPENSSL_TARGET_ARCH
default "linux-ppc" if BR2_PACKAGE_LIBOPENSSL_TARGET_ARCH_LINUX_PPC
default "linux-ppc64" if BR2_powerpc64
default "linux-ppc64le" if BR2_powerpc64le
- default "linux-x86" if BR2_i386
+ default "linux-x86" if BR2_i386 && !BR2_TOOLCHAIN_HAS_LIBATOMIC
+ default "linux-x86-latomic" if BR2_i386 && BR2_TOOLCHAIN_HAS_LIBATOMIC
default "linux-x86_64" if BR2_x86_64
# no-asm is needed with generic architectures such as
# linux-generic{32,64}, see
More information about the buildroot
mailing list