openssl: re-enable parallel build
PATCH 1/1 openssl: re-enable parallel build
From: Gustavo Zacarias <[email protected]>
The previous incarnation was incomplete, it only applied one of the Gentoo patches, hence it had corner cases.
Apply all 4 patches as pointed out by Mike on the mailing list.
--- ...-waste-time-building-manpages-if-we-re-not-going.patch | 5 +++-- package/openssl/openssl.hash | 5 +++++ package/openssl/openssl.mk | 15 ++++++++++----- 3 files changed, 18 insertions(+), 7 deletions(-)
package/openssl/0001-Dont-waste-time-building-manpages-if-we-re-not-going.patch +3 -2
@@ -4,6 +4,7 @@ Date: Sat, 16 May 2015 18:53:51 +0200 Subject: Dont waste time building manpages if we're not going to use em. Signed-off-by: Ryan Barnett <[email protected]> +[Gustavo: update for parallel-build] --- Makefile.org | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
@@ -16,8 +17,8 @@ index 60f07cc..976ceaf 100644 dist_pem_h: (cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean) --install: all install_docs install_sw -+install: all install_sw +-install: install_docs install_sw ++install: install_sw install_sw: @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
package/openssl/openssl.hash +5 -0
@@ -1,2 +1,7 @@ # From https://www.openssl.org/source/openssl-1.0.2e.tar.gz.sha256 sha256 e23ccafdb75cfcde782da0151731aa2185195ac745eea3846133f2e05c0e0bff openssl-1.0.2e.tar.gz +# Locally computed +sha256 eddd8a5123748052c598214487ac178e4bfa4e31ba2ec520c70d59c8c5bfa2e9 openssl-1.0.2a-parallel-install-dirs.patch?id=c8abcbe8de5d3b6cdd68c162f398c011ff6e2d9d +sha256 147c3eeaad614c044749ea527cb433eae5e2d5cad34a78c6ba61cd967bfbe01f openssl-1.0.2a-parallel-obj-headers.patch?id=c8abcbe8de5d3b6cdd68c162f398c011ff6e2d9d +sha256 30cb49489de5041841a74da9155cd4fabfbce33237262ba7cd23974314ae2956 openssl-1.0.2a-parallel-symlinking.patch?id=c8abcbe8de5d3b6cdd68c162f398c011ff6e2d9d +sha256 deaf6f3af41874ecc6d63841ea14b8e6c71cea81d4a511a754bc90c9a993147f openssl-1.0.2d-parallel-build.patch?id=c8abcbe8de5d3b6cdd68c162f398c011ff6e2d9d
package/openssl/openssl.mk +10 -5
@@ -13,6 +13,11 @@ OPENSSL_DEPENDENCIES = zlib HOST_OPENSSL_DEPENDENCIES = host-zlib OPENSSL_TARGET_ARCH = generic32 OPENSSL_CFLAGS = $(TARGET_CFLAGS) +OPENSSL_PATCH = \ + https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-libs/openssl/files/openssl-1.0.2d-parallel-build.patch?id=c8abcbe8de5d3b6cdd68c162f398c011ff6e2d9d \ + https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-libs/openssl/files/openssl-1.0.2a-parallel-obj-headers.patch?id=c8abcbe8de5d3b6cdd68c162f398c011ff6e2d9d \ + https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-libs/openssl/files/openssl-1.0.2a-parallel-install-dirs.patch?id=c8abcbe8de5d3b6cdd68c162f398c011ff6e2d9d \ + https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-libs/openssl/files/openssl-1.0.2a-parallel-symlinking.patch?id=c8abcbe8de5d3b6cdd68c162f398c011ff6e2d9d ifeq ($(BR2_USE_MMU),) OPENSSL_CFLAGS += -DHAVE_FORK=0
@@ -98,23 +103,23 @@ OPENSSL_POST_CONFIGURE_HOOKS += OPENSSL_FIXUP_STATIC_MAKEFILE endif define HOST_OPENSSL_BUILD_CMDS - $(MAKE1) -C $(@D) + $(MAKE) -C $(@D) endef define OPENSSL_BUILD_CMDS - $(MAKE1) -C $(@D) + $(MAKE) -C $(@D) endef define OPENSSL_INSTALL_STAGING_CMDS - $(MAKE1) -C $(@D) INSTALL_PREFIX=$(STAGING_DIR) install + $(MAKE) -C $(@D) INSTALL_PREFIX=$(STAGING_DIR) install endef define HOST_OPENSSL_INSTALL_CMDS - $(MAKE1) -C $(@D) install + $(MAKE) -C $(@D) install endef define OPENSSL_INSTALL_TARGET_CMDS - $(MAKE1) -C $(@D) INSTALL_PREFIX=$(TARGET_DIR) install + $(MAKE) -C $(@D) INSTALL_PREFIX=$(TARGET_DIR) install rm -rf $(TARGET_DIR)/usr/lib/ssl rm -f $(TARGET_DIR)/usr/bin/c_rehash endef
Signature · 1 line
2.4.10
Thomas Petazzoni
AppliedPATCH 1/1 openssl: re-enable parallel build
Gustavo,
Quoted 6 lines · gustavo.zacarias at free-electrons.com
From: Gustavo Zacarias <[email protected]>
The previous incarnation was incomplete, it only applied one of the Gentoo patches, hence it had corner cases.
Apply all 4 patches as pointed out by Mike on the mailing list.
Quoted 6 lines
Signed-off-by Gustavo Zacarias <[email protected]>--- ...-waste-time-building-manpages-if-we-re-not-going.patch | 5 +++-- package/openssl/openssl.hash | 5 +++++ package/openssl/openssl.mk | 15 ++++++++++----- 3 files changed, 18 insertions(+), 7 deletions(-)
Let's if this incarnation works properly :-)
Applied, thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH 1/1 openssl: re-enable parallel build
Quoted 8 lines · Thomas Petazzoni
Quoted 6 lines · gustavo.zacarias at free-electrons.com
From: Gustavo Zacarias <[email protected]>
The previous incarnation was incomplete, it only applied one of the Gentoo patches, hence it had corner cases.
Apply all 4 patches as pointed out by Mike on the mailing list.
Quoted 8 lines
Quoted 6 lines
Signed-off-by Gustavo Zacarias <[email protected]>--- ...-waste-time-building-manpages-if-we-re-not-going.patch | 5 +++-- package/openssl/openssl.hash | 5 +++++ package/openssl/openssl.mk | 15 ++++++++++----- 3 files changed, 18 insertions(+), 7 deletions(-)Let's if this incarnation works properly :-)
when you guys see issues when using Gentoo patches, feel free to cc me.
i don't normally watch this list.
-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20151218/e78b2d65/attachment.asc>