Skip to contentSkip to conversation

Revert "openssl: enable parallel build and installation"

PATCH New Yann E. MORIN 2 participants 2 messages Nov 23, 2015

lore
Share & tools
lore

Yann E. MORIN

author
#0 lore raw

PATCH 1/1 Revert "openssl: enable parallel build and installation"

This reverts commit 55e4ec054c21b9164e10c323a5f0afff1deb1d67.

There are still build failures in parallel builds:

    http://autobuild.buildroot.org/results/9a0/9a0fc1064010a658155e6a18ec72e0e3c58ec7f6/
    http://autobuild.buildroot.org/results/c28/c28064f383da1f577bd9227d004f1939daf4579f/
    http://autobuild.buildroot.org/results/218/2180b9d900b27103acc92a2932f7ffa560b04831/
    and so on...
Signed-off-by "Yann E. MORIN" <[email protected]>
Cc Ryan Barnett <[email protected]>
Cc Thomas Petazzoni <[email protected]>
Cc Gustavo Zacarias <[email protected]>
---
 package/openssl/openssl.hash |  2 --
 package/openssl/openssl.mk   | 12 +++++-------
 2 files changed, 5 insertions(+), 9 deletions(-)
package/openssl/openssl.hash +0 -2
index 9eaa363..355be79 100644
@@ -1,4 +1,2 @@
 # From https://www.openssl.org/source/openssl-1.0.2d.tar.gz.sha256
 sha256	671c36487785628a703374c652ad2cebea45fa920ae5681515df25d9f2c9a8c8	openssl-1.0.2d.tar.gz
-# Locally computed
-sha256	deaf6f3af41874ecc6d63841ea14b8e6c71cea81d4a511a754bc90c9a993147f	openssl-1.0.2d-parallel-build.patch?id=56bd759df1d0c750a065b8c845e93d5dfa6b549d
package/openssl/openssl.mk +5 -7
index cad8d0c..da492ff 100644
@@ -13,8 +13,6 @@ 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=56bd759df1d0c750a065b8c845e93d5dfa6b549d
 
 ifeq ($(BR2_USE_MMU),)
 OPENSSL_CFLAGS += -DHAVE_FORK=0

@@ -101,23 +99,23 @@ OPENSSL_POST_CONFIGURE_HOOKS += OPENSSL_FIXUP_STATIC_MAKEFILE
 endif
 
 define HOST_OPENSSL_BUILD_CMDS
-	$(MAKE) -C $(@D)
+	$(MAKE1) -C $(@D)
 endef
 
 define OPENSSL_BUILD_CMDS
-	$(MAKE) -C $(@D)
+	$(MAKE1) -C $(@D)
 endef
 
 define OPENSSL_INSTALL_STAGING_CMDS
-	$(MAKE) -C $(@D) INSTALL_PREFIX=$(STAGING_DIR) install
+	$(MAKE1) -C $(@D) INSTALL_PREFIX=$(STAGING_DIR) install
 endef
 
 define HOST_OPENSSL_INSTALL_CMDS
-	$(MAKE) -C $(@D) install
+	$(MAKE1) -C $(@D) install
 endef
 
 define OPENSSL_INSTALL_TARGET_CMDS
-	$(MAKE) -C $(@D) INSTALL_PREFIX=$(TARGET_DIR) install
+	$(MAKE1) -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
1.9.1
Applied
#1 lore raw

PATCH 1/1 Revert "openssl: enable parallel build and installation"

Dear Yann E. MORIN,

Quoted 8 lines · Yann E. MORIN

This reverts commit 55e4ec054c21b9164e10c323a5f0afff1deb1d67.

There are still build failures in parallel builds:

    http://autobuild.buildroot.org/results/9a0/9a0fc1064010a658155e6a18ec72e0e3c58ec7f6/
    http://autobuild.buildroot.org/results/c28/c28064f383da1f577bd9227d004f1939daf4579f/
    http://autobuild.buildroot.org/results/218/2180b9d900b27103acc92a2932f7ffa560b04831/
    and so on...
Quoted 8 lines
Signed-off-by "Yann E. MORIN" <[email protected]>
Cc Ryan Barnett <[email protected]>
Cc Thomas Petazzoni <[email protected]>
Cc Gustavo Zacarias <[email protected]>
---
 package/openssl/openssl.hash |  2 --
 package/openssl/openssl.mk   | 12 +++++-------
 2 files changed, 5 insertions(+), 9 deletions(-)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com