]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
Serialize install process to avoid multiple make depend operations
authorNeil Horman <nhorman@openssl.org>
Mon, 14 Apr 2025 16:23:15 +0000 (12:23 -0400)
committerNeil Horman <nhorman@openssl.org>
Wed, 16 Apr 2025 20:13:02 +0000 (16:13 -0400)
If make install is run with a large -j value (make install -j N , where
N < 1)

We can run into a situation in which the install fails because multiple
make depend operations are running in parallel, which will fail due to
makefile rewriting.

Serialize the install process to guarantee that those operations don't
step on one another

Fixes # 27074

Reviewed-by: Saša Nedvědický <sashan@openssl.org>
Reviewed-by: Paul Dale <ppzgs1@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/27388)

Configurations/unix-Makefile.tmpl

index e85763ccf8351df33880ac4aeae61751f8132cee..b67172381311ba332d0412bb8049ba86ffcbf794 100644 (file)
@@ -650,7 +650,11 @@ depend: Makefile
 # Install helper targets #############################################
 ##@ Installation
 
-install: install_sw install_ssldirs {- "install_docs" if !$disabled{docs}; -} {- $disabled{fips} ? "" : "install_fips" -} ## Install software and documentation, create OpenSSL directories
+install: Makefile ## Install software and documentation, create OpenSSL directories
+       $(MAKE) install_sw
+       $(MAKE) install_ssldirs
+       {- "\$(MAKE) install_docs" if !$disabled{docs} -}
+       {- "\$(MAKE) install_fips" if !$disabled{fips} -}
 
 uninstall: {- "uninstall_docs" if !$disabled{docs}; -} uninstall_sw {- $disabled{fips} ? "" : "uninstall_fips" -} ## Uninstall software and documentation