0003-Revert-Fix-static-builds.patch 1.4 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445
  1. From a048522f64dbbe90cf77aea0c3f47cccdad50742 Mon Sep 17 00:00:00 2001
  2. From: Bernd Kuhls <bernd@kuhls.net>
  3. Date: Fri, 21 Jul 2023 19:30:40 +0200
  4. Subject: [PATCH] Revert "Fix -static builds"
  5. This reverts commit cfd7225fbb9507b2e443a494459bdaab5236d29d.
  6. Upstream: https://github.com/openssl/openssl/issues/14574#issuecomment-817209126
  7. Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
  8. [Dario: make the patch to be applied with fuzz factor 0]
  9. Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
  10. ---
  11. Configure | 8 ++++----
  12. 1 file changed, 4 insertions(+), 4 deletions(-)
  13. diff --git a/Configure b/Configure
  14. index 2a5e58805c3b..0e8c1ce5cc74 100755
  15. --- a/Configure
  16. +++ b/Configure
  17. @@ -1466,10 +1466,6 @@ if ($config{prefix} && !$config{CROSS_COMPILE}) {
  18. unless file_name_is_absolute($config{prefix});
  19. }
  20. -if (grep { $_ =~ /(?:^|\s)-static(?:\s|$)/ } @{$config{LDFLAGS}}) {
  21. - disable('static', 'pic', 'threads');
  22. -}
  23. -
  24. # Allow overriding the build file name
  25. $config{build_file} = env('BUILDFILE') || $target{build_file} || "Makefile";
  26. @@ -1764,6 +1760,10 @@ if ($strict_warnings)
  27. }
  28. }
  29. +if (grep { $_ =~ /(?:^|\s)-static(?:\s|$)/ } @{$config{LDFLAGS}}) {
  30. + disable('static', 'pic', 'threads');
  31. +}
  32. +
  33. $config{CFLAGS} = [ map { $_ eq '--ossl-strict-warnings'
  34. ? @strict_warnings_collection
  35. : ( $_ ) }
  36. --
  37. 2.43.0