1From 847a7b744e31b9f57d2a3de495187db1dc0ee6d7 Mon Sep 17 00:00:00 2001
2From: Bernd Kuhls <bernd@kuhls.net>
3Date: Fri, 21 Jul 2023 19:30:40 +0200
4Subject: [PATCH] Revert "Fix -static builds"
5
6This reverts commit cfd7225fbb9507b2e443a494459bdaab5236d29d.
7
8Upstream: https://github.com/openssl/openssl/issues/14574#issuecomment-817209126
9
10Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
11---
12 Configure | 8 ++++----
13 1 file changed, 4 insertions(+), 4 deletions(-)
14
15diff --git a/Configure b/Configure
16index 2c17f4186b..94cab4c3c4 100755
17--- a/Configure
18+++ b/Configure
19@@ -1377,10 +1377,6 @@ foreach (keys %useradd) {
20 # At this point, we can forget everything about %user and %useradd,
21 # because it's now all been merged into the corresponding $config entry
22
23-if (grep { $_ =~ /(?:^|\s)-static(?:\s|$)/ } @{$config{LDFLAGS}}) {
24-    disable('static', 'pic', 'threads');
25-}
26-
27 # Allow overriding the build file name
28 $config{build_file} = env('BUILDFILE') || $target{build_file} || "Makefile";
29
30@@ -1671,6 +1667,10 @@ if ($strict_warnings)
31                 }
32         }
33
34+if (grep { $_ =~ /(?:^|\s)-static(?:\s|$)/ } @{$config{LDFLAGS}}) {
35+    disable('static', 'pic', 'threads');
36+}
37+
38 $config{CFLAGS} = [ map { $_ eq '--ossl-strict-warnings'
39                               ? @strict_warnings_collection
40                               : ( $_ ) }
41--
422.39.2
43
44