Commit 82ca4318 authored by Richard Levitte's avatar Richard Levitte
Browse files

Allow parallel install 



When trying 'make -j{n} install', you may occasionally run into
trouble because to sub-targets (install_dev and install_runtime) try
to install the same shared libraries.  That makes parallel install
difficult.

This is solved by dividing install_runtime into two parts, one for
libraries and one for programs, and have install_dev depend on
install_runtime_libs instead of installing the shared runtime
libraries itself.

Fixes #7466

Reviewed-by: default avatarPaul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/7583)

(cherry picked from commit c1123d9f)
parent 26d7fce1

Configurations/descrip.mms.tmpl

+25 −28
Original line number Diff line number Diff line
@@ -368,12 +368,10 @@ descrip.mms : FORCE 


# Install helper targets #############################################



install_sw : all install_shared _install_dev_ns -

             install_engines _install_runtime_ns -

install_sw : all install_dev install_engines install_runtime -

             install_startup install_ivp



uninstall_sw : uninstall_shared _uninstall_dev_ns -

               uninstall_engines _uninstall_runtime_ns -

uninstall_sw : uninstall_dev uninstall_engines uninstall_runtime -

               uninstall_startup uninstall_ivp



install_docs : install_html_docs
@@ -396,17 +394,7 @@ install_ssldirs : check_INSTALLTOP 
                COPY/PROT=W:R {- sourcefile("apps", "openssl-vms.cnf") -} -

                        ossl_dataroot:[000000]openssl.cnf



install_shared : check_INSTALLTOP

        @ {- output_off() if $disabled{shared}; "" -} !

        @ WRITE SYS$OUTPUT "*** Installing shareable images"

        @ ! Install shared (runtime) libraries

        - CREATE/DIR ossl_installroot:[LIB.'arch']

        {- join("\n        ",

                map { "COPY/PROT=W:R $_.EXE ossl_installroot:[LIB.'arch']" }

                @install_shlibs) -}

        @ {- output_on() if $disabled{shared}; "" -} !



_install_dev_ns : check_INSTALLTOP

install_dev : check_INSTALLTOP install_runtime_libs

        @ WRITE SYS$OUTPUT "*** Installing development files"

        @ ! Install header files

        - CREATE/DIR ossl_installroot:[include.openssl]
@@ -417,19 +405,6 @@ _install_dev_ns : check_INSTALLTOP 
                map { "COPY/PROT=W:R $_.OLB ossl_installroot:[LIB.'arch']" }

                @{$unified_info{install}->{libraries}}) -}



install_dev : install_shared _install_dev_ns



_install_runtime_ns : check_INSTALLTOP

        @ ! Install the main program

        - CREATE/DIR ossl_installroot:[EXE.'arch']

        COPY/PROT=W:RE [.APPS]openssl.EXE -

                ossl_installroot:[EXE.'arch']openssl{- $osslver -}.EXE

        @ ! Install scripts

        COPY/PROT=W:RE $(BIN_SCRIPTS) ossl_installroot:[EXE]

        @ ! {- output_on() if $disabled{apps}; "" -}



install_runtime : install_shared _install_runtime_ns



install_engines : check_INSTALLTOP

        @ {- output_off() unless scalar @{$unified_info{engines}}; "" -} !

        @ WRITE SYS$OUTPUT "*** Installing engines"
@@ -439,6 +414,28 @@ install_engines : check_INSTALLTOP 
                @{$unified_info{install}->{engines}}) -}

        @ {- output_on() unless scalar @{$unified_info{engines}}; "" -} !



install_runtime: install_programs



install_runtime_libs : check_INSTALLTOP

        @ {- output_off() if $disabled{shared}; "" -} !

        @ WRITE SYS$OUTPUT "*** Installing shareable images"

        @ ! Install shared (runtime) libraries

        - CREATE/DIR ossl_installroot:[LIB.'arch']

        {- join("\n        ",

                map { "COPY/PROT=W:R $_.EXE ossl_installroot:[LIB.'arch']" }

                @install_shlibs) -}

        @ {- output_on() if $disabled{shared}; "" -} !



install_programs : check_INSTALLTOP install_runtime_libs

        @ {- output_off() if $disabled{apps}; "" -} !

        @ ! Install the main program

        - CREATE/DIR ossl_installroot:[EXE.'arch']

        COPY/PROT=W:RE [.APPS]openssl.EXE -

                ossl_installroot:[EXE.'arch']openssl{- $osslver -}.EXE

        @ ! Install scripts

        COPY/PROT=W:RE $(BIN_SCRIPTS) ossl_installroot:[EXE]

        @ ! {- output_on() if $disabled{apps}; "" -}



install_startup : [.VMS]openssl_startup.com [.VMS]openssl_shutdown.com -

                 [.VMS]openssl_utils.com, check_INSTALLTOP

        - CREATE/DIR ossl_installroot:[SYS$STARTUP]

Configurations/unix-Makefile.tmpl

+17 −6
Original line number Diff line number Diff line
@@ -355,7 +355,7 @@ install_ssldirs: 
		chmod 644 $(DESTDIR)$(OPENSSLDIR)/openssl.cnf; \

	fi



install_dev:

install_dev: install_runtime_libs

	@[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1)

	@echo "*** Installing development files"

	@$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(INSTALLTOP)/include/openssl
@@ -488,9 +488,10 @@ uninstall_engines: 
	done

	-$(RMDIR) $(DESTDIR)$(ENGINESDIR)



install_runtime:

install_runtime: install_programs



install_runtime_libs:

	@[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1)

	@$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(INSTALLTOP)/bin

	@ : {- output_off() if windowsdll(); "" -}

	@$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)

	@ : {- output_on() if windowsdll(); "" -}
@@ -512,6 +513,11 @@ install_runtime: 
		      $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn; \

		: {- output_on() if windowsdll(); "" -}; \

	done



install_programs: install_runtime_libs

	@[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1)

	@$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(INSTALLTOP)/bin

	@$(ECHO) "*** Installing runtime programs"

	@set -e; for x in dummy $(INSTALL_PROGRAMS); do \

		if [ "$$x" = "dummy" ]; then continue; fi; \

		fn=`basename $$x`; \
@@ -531,8 +537,10 @@ install_runtime: 
		      $(DESTDIR)$(INSTALLTOP)/bin/$$fn; \

	done



uninstall_runtime:

	@echo "*** Uninstalling runtime files"

uninstall_runtime: uninstall_programs uninstall_runtime_libs



uninstall_programs:

	@echo "*** Uninstalling runtime programs"

	@set -e; for x in dummy $(INSTALL_PROGRAMS); \

	do  \

		if [ "$$x" = "dummy" ]; then continue; fi; \
@@ -547,6 +555,10 @@ uninstall_runtime: 
		echo "$(RM) $(DESTDIR)$(INSTALLTOP)/bin/$$fn"; \

		$(RM) $(DESTDIR)$(INSTALLTOP)/bin/$$fn; \

	done

	-$(RMDIR) $(DESTDIR)$(INSTALLTOP)/bin



uninstall_runtime_libs:

	@$(ECHO) "*** Uninstalling runtime libraries"

	@ : {- output_off() unless windowsdll(); "" -}

	@set -e; for s in dummy $(INSTALL_SHLIBS); do \

		if [ "$$s" = "dummy" ]; then continue; fi; \
@@ -555,7 +567,6 @@ uninstall_runtime: 
		$(RM) $(DESTDIR)$(INSTALLTOP)/bin/$$fn; \

	done

	@ : {- output_on() unless windowsdll(); "" -}

	-$(RMDIR) $(DESTDIR)$(INSTALLTOP)/bin





install_man_docs:

Configurations/windows-makefile.tmpl

+10 −3
Original line number Diff line number Diff line
@@ -287,7 +287,7 @@ install_ssldirs: 
	@"$(PERL)" "$(SRCDIR)\util\copy.pl" $(MISC_SCRIPTS) \

                                        "$(OPENSSLDIR)\misc"



install_dev:

install_dev: install_runtime_libs

	@if "$(INSTALLTOP)"=="" ( $(ECHO) "INSTALLTOP should not be empty" & exit 1 )

	@$(ECHO) "*** Installing development files"

	@"$(PERL)" "$(SRCDIR)\util\mkdir-p.pl" "$(INSTALLTOP)\include\openssl"
@@ -320,15 +320,22 @@ install_engines: 


uninstall_engines:



install_runtime:

install_runtime: install_programs



install_runtime_libs:

	@if "$(INSTALLTOP)"=="" ( $(ECHO) "INSTALLTOP should not be empty" & exit 1 )

	@$(ECHO) "*** Installing runtime files"

	@$(ECHO) "*** Installing runtime libraries"

	@"$(PERL)" "$(SRCDIR)\util\mkdir-p.pl" "$(INSTALLTOP)\bin"

	@if not "$(SHLIBS)"=="" \

	 "$(PERL)" "$(SRCDIR)\util\copy.pl" $(INSTALL_SHLIBS) "$(INSTALLTOP)\bin"

	@if not "$(SHLIBS)"=="" \

	 "$(PERL)" "$(SRCDIR)\util\copy.pl" $(INSTALL_SHLIBPDBS) \

                                        "$(INSTALLTOP)\bin"



install_programs: install_runtime_libs

	@if "$(INSTALLTOP)"=="" ( $(ECHO) "INSTALLTOP should not be empty" & exit 1 )

	@$(ECHO) "*** Installing runtime programs"

	@"$(PERL)" "$(SRCDIR)\util\mkdir-p.pl" "$(INSTALLTOP)\bin"

	@"$(PERL)" "$(SRCDIR)\util\copy.pl" $(INSTALL_PROGRAMS) \

                                        "$(INSTALLTOP)\bin"

	@"$(PERL)" "$(SRCDIR)\util\copy.pl" $(INSTALL_PROGRAMPDBS) \