package/libopenssl: enable threads on static builds
Revert upstream commit as proposed on the upstream bugtracker. Fixes: http://autobuild.buildroot.net/results/b8e/b8efae5bf6ac3b51e8443951ef1dd88824af3f2b/ Signed-off-by: Bernd Kuhls <bernd@kuhls.net> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
parent
598bfea96d
commit
ea3e60229b
43
package/libopenssl/0006-Revert-Fix-static-builds.patch
Normal file
43
package/libopenssl/0006-Revert-Fix-static-builds.patch
Normal file
@ -0,0 +1,43 @@
|
||||
From 847a7b744e31b9f57d2a3de495187db1dc0ee6d7 Mon Sep 17 00:00:00 2001
|
||||
From: Bernd Kuhls <bernd@kuhls.net>
|
||||
Date: Fri, 21 Jul 2023 19:30:40 +0200
|
||||
Subject: [PATCH] Revert "Fix -static builds"
|
||||
|
||||
This reverts commit cfd7225fbb9507b2e443a494459bdaab5236d29d.
|
||||
|
||||
Upstream: https://github.com/openssl/openssl/issues/14574#issuecomment-817209126
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
|
||||
---
|
||||
Configure | 8 ++++----
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/Configure b/Configure
|
||||
index 2c17f4186b..94cab4c3c4 100755
|
||||
--- a/Configure
|
||||
+++ b/Configure
|
||||
@@ -1438,10 +1438,6 @@ foreach (keys %useradd) {
|
||||
# At this point, we can forget everything about %user and %useradd,
|
||||
# because it's now all been merged into the corresponding $config entry
|
||||
|
||||
-if (grep { $_ =~ /(?:^|\s)-static(?:\s|$)/ } @{$config{LDFLAGS}}) {
|
||||
- disable('static', 'pic', 'threads');
|
||||
-}
|
||||
-
|
||||
# Allow overriding the build file name
|
||||
$config{build_file} = env('BUILDFILE') || $target{build_file} || "Makefile";
|
||||
|
||||
@@ -1728,6 +1724,10 @@ if ($strict_warnings)
|
||||
}
|
||||
}
|
||||
|
||||
+if (grep { $_ =~ /(?:^|\s)-static(?:\s|$)/ } @{$config{LDFLAGS}}) {
|
||||
+ disable('static', 'pic', 'threads');
|
||||
+}
|
||||
+
|
||||
$config{CFLAGS} = [ map { $_ eq '--ossl-strict-warnings'
|
||||
? @strict_warnings_collection
|
||||
: ( $_ ) }
|
||||
--
|
||||
2.39.2
|
||||
|
Loading…
Reference in New Issue
Block a user