0005-Revert-Fix-static-builds.patch 1.3 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243
  1. From 847a7b744e31b9f57d2a3de495187db1dc0ee6d7 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. ---
  9. Configure | 8 ++++----
  10. 1 file changed, 4 insertions(+), 4 deletions(-)
  11. diff --git a/Configure b/Configure
  12. index 2c17f4186b..94cab4c3c4 100755
  13. --- a/Configure
  14. +++ b/Configure
  15. @@ -1377,10 +1377,6 @@ foreach (keys %useradd) {
  16. # At this point, we can forget everything about %user and %useradd,
  17. # because it's now all been merged into the corresponding $config entry
  18. -if (grep { $_ =~ /(?:^|\s)-static(?:\s|$)/ } @{$config{LDFLAGS}}) {
  19. - disable('static', 'pic', 'threads');
  20. -}
  21. -
  22. # Allow overriding the build file name
  23. $config{build_file} = env('BUILDFILE') || $target{build_file} || "Makefile";
  24. @@ -1671,6 +1667,10 @@ if ($strict_warnings)
  25. }
  26. }
  27. +if (grep { $_ =~ /(?:^|\s)-static(?:\s|$)/ } @{$config{LDFLAGS}}) {
  28. + disable('static', 'pic', 'threads');
  29. +}
  30. +
  31. $config{CFLAGS} = [ map { $_ eq '--ossl-strict-warnings'
  32. ? @strict_warnings_collection
  33. : ( $_ ) }
  34. --
  35. 2.39.2