| https://rt.openssl.org/Ticket/Display.html?id=3736&user=guest&pass=guest |
| |
| From aba899f2eca21e11e5e9797bf8258e7265dea9f5 Mon Sep 17 00:00:00 2001 |
| From: Mike Frysinger <vapier@gentoo.org> |
| Date: Sun, 8 Mar 2015 01:32:01 -0500 |
| Subject: [PATCH] fix parallel install with dir creation |
| |
| The mkdir-p.pl does not handle parallel creation of directories. |
| This comes up when the install_sw and install_docs rules run and |
| both call mkdir-p.pl on sibling directory trees. |
| |
| Instead, lets create a single install_dirs rule that makes all of |
| the dirs we need, and have these two install steps depend on that. |
| --- |
| Makefile.org | 17 +++++++++-------- |
| 1 file changed, 9 insertions(+), 8 deletions(-) |
| |
| diff --git a/Makefile.org b/Makefile.org |
| index a6d9471..78e6143 100644 |
| --- a/Makefile.org |
| +++ b/Makefile.org |
| @@ -536,9 +536,9 @@ |
| dist_pem_h: |
| (cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean) |
| |
| -install: all install_docs install_sw |
| +install: install_docs install_sw |
| |
| -install_sw: |
| +install_dirs: |
| @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \ |
| $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR) \ |
| $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines \ |
| @@ -547,6 +547,13 @@ |
| $(INSTALL_PREFIX)$(OPENSSLDIR)/misc \ |
| $(INSTALL_PREFIX)$(OPENSSLDIR)/certs \ |
| $(INSTALL_PREFIX)$(OPENSSLDIR)/private |
| + @$(PERL) $(TOP)/util/mkdir-p.pl \ |
| + $(INSTALL_PREFIX)$(MANDIR)/man1 \ |
| + $(INSTALL_PREFIX)$(MANDIR)/man3 \ |
| + $(INSTALL_PREFIX)$(MANDIR)/man5 \ |
| + $(INSTALL_PREFIX)$(MANDIR)/man7 |
| + |
| +install_sw: install_dirs |
| @set -e; headerlist="$(EXHEADER)"; for i in $$headerlist;\ |
| do \ |
| (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ |
| @@ -636,12 +643,7 @@ |
| done; \ |
| done |
| |
| -install_docs: |
| - @$(PERL) $(TOP)/util/mkdir-p.pl \ |
| - $(INSTALL_PREFIX)$(MANDIR)/man1 \ |
| - $(INSTALL_PREFIX)$(MANDIR)/man3 \ |
| - $(INSTALL_PREFIX)$(MANDIR)/man5 \ |
| - $(INSTALL_PREFIX)$(MANDIR)/man7 |
| +install_docs: install_dirs |
| @pod2man="`cd ./util; ./pod2mantest $(PERL)`"; \ |
| here="`pwd`"; \ |
| filecase=; \ |
| -- |
| 2.3.4 |
| |