2
1

0004-Serialize-install-process-to-avoid-multiple-make-dep.patch 1.7 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344
  1. From 4562b002366535b3d387fae7fa1dbd8e315ae142 Mon Sep 17 00:00:00 2001
  2. From: Neil Horman <nhorman@openssl.org>
  3. Date: Mon, 14 Apr 2025 12:23:15 -0400
  4. Subject: [PATCH] Serialize install process to avoid multiple make depend
  5. operations
  6. If make install is run with a large -j value (make install -j N , where
  7. N > 1)
  8. We can run into a situation in which the install fails because multiple
  9. make depend operations are running in parallel, which will fail due to
  10. makefile rewriting.
  11. Serialize the install process to guarantee that those operations don't
  12. step on one another
  13. Fixes # 27074
  14. Upstream: https://github.com/openssl/openssl/pull/27388
  15. Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
  16. ---
  17. Configurations/unix-Makefile.tmpl | 6 +++++-
  18. 1 file changed, 5 insertions(+), 1 deletion(-)
  19. diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
  20. index e85763ccf8..b671723813 100644
  21. --- a/Configurations/unix-Makefile.tmpl
  22. +++ b/Configurations/unix-Makefile.tmpl
  23. @@ -650,7 +650,11 @@ depend: Makefile
  24. # Install helper targets #############################################
  25. ##@ Installation
  26. -install: install_sw install_ssldirs {- "install_docs" if !$disabled{docs}; -} {- $disabled{fips} ? "" : "install_fips" -} ## Install software and documentation, create OpenSSL directories
  27. +install: Makefile ## Install software and documentation, create OpenSSL directories
  28. + $(MAKE) install_sw
  29. + $(MAKE) install_ssldirs
  30. + {- "\$(MAKE) install_docs" if !$disabled{docs} -}
  31. + {- "\$(MAKE) install_fips" if !$disabled{fips} -}
  32. uninstall: {- "uninstall_docs" if !$disabled{docs}; -} uninstall_sw {- $disabled{fips} ? "" : "uninstall_fips" -} ## Uninstall software and documentation
  33. --
  34. 2.39.5