mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-10-11 19:31:50 -09:00
7dab0537a0
Patch was committed upstream in a slightly different version0984041283and was first released in version 3.0 which was added to buildroot with commit3c66f65a6a. Added Upstream: tag to patch 0001. Renumbered patch 0003 and updated Upstream: tag. Signed-off-by: Bernd Kuhls <bernd@kuhls.net> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
47 lines
1.4 KiB
Diff
47 lines
1.4 KiB
Diff
From a048522f64dbbe90cf77aea0c3f47cccdad50742 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-3791009156
|
|
(rejected)
|
|
|
|
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
|
|
[Dario: make the patch to be applied with fuzz factor 0]
|
|
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
|
|
---
|
|
Configure | 8 ++++----
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/Configure b/Configure
|
|
index ac3206e..764ef89 100755
|
|
--- a/Configure
|
|
+++ b/Configure
|
|
@@ -1510,10 +1510,6 @@ if ($config{prefix} && !$config{CROSS_COMPILE}) {
|
|
unless file_name_is_absolute($config{prefix});
|
|
}
|
|
|
|
-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";
|
|
|
|
@@ -1808,6 +1804,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.43.0
|
|
|