[Buildroot] [PATCH 1/2] package/libopenssl: renumber patch

[Buildroot] [PATCH 1/2] package/libopenssl: renumber patch

[Bernd Kuhls]

Commit ea3e60229bc5647e587685023de475276e28584d added a patch with a
wrong number.

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
 ...ix-static-builds.patch => 0005-Revert-Fix-static-builds.patch} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename package/libopenssl/{0006-Revert-Fix-static-builds.patch => 0005-Revert-Fix-static-builds.patch} (100%)

diff --git a/package/libopenssl/0006-Revert-Fix-static-builds.patch b/package/libopenssl/0005-Revert-Fix-static-builds.patch
similarity index 100%
rename from package/libopenssl/0006-Revert-Fix-static-builds.patch
rename to package/libopenssl/0005-Revert-Fix-static-builds.patch
-- 
2.39.2

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 2/2] package/libopenssl: fix libatomic dependency for x86 builds

[Bernd Kuhls]

Fixes:
autobuild.buildroot.net/results/ba9/ba926fc27cf3d97274729b3ec1cadb3229bd3af3/

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
 .../0006-Add-linux-x86-latomic-target.patch   | 30 +++++++++++++++++++
 package/libopenssl/Config.in                  |  3 +-
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 package/libopenssl/0006-Add-linux-x86-latomic-target.patch

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@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@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
-- 
2.39.2

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/2] package/libopenssl: renumber patch

[Thomas Petazzoni via buildroot]

On Fri, 28 Jul 2023 17:19:02 +0200
Bernd Kuhls <bernd@kuhls.net> wrote:

> Commit ea3e60229bc5647e587685023de475276e28584d added a patch with a
> wrong number.
> 
> Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
> ---
>  ...ix-static-builds.patch => 0005-Revert-Fix-static-builds.patch} | 0
>  1 file changed, 0 insertions(+), 0 deletions(-)
>  rename package/libopenssl/{0006-Revert-Fix-static-builds.patch => 0005-Revert-Fix-static-builds.patch} (100%)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 2/2] package/libopenssl: fix libatomic dependency for x86 builds

[Thomas Petazzoni via buildroot]

On Fri, 28 Jul 2023 17:19:03 +0200
Bernd Kuhls <bernd@kuhls.net> wrote:

> Fixes:
> autobuild.buildroot.net/results/ba9/ba926fc27cf3d97274729b3ec1cadb3229bd3af3/
> 
> Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
> ---
>  .../0006-Add-linux-x86-latomic-target.patch   | 30 +++++++++++++++++++
>  package/libopenssl/Config.in                  |  3 +-
>  2 files changed, 32 insertions(+), 1 deletion(-)
>  create mode 100644 package/libopenssl/0006-Add-linux-x86-latomic-target.patch

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot