From 86f173a74408a35536429198ec10970ee762bafb Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 15 Apr 2025 22:00:47 +0200 Subject: [PATCH] Revert "package/libopenssl do not build in parallel" This reverts commit 27ab880ebb9a3efdec15733841f7b88063604247. With the (proposed) fix from the openssl developers added as 0004-Serialize-install-process-to-avoid-multiple-make-dep.patch, the workaround can now be dropped so openssl can again be built and installed in parallel, significantly speeding up builds. Signed-off-by: Peter Korsgaard Reviewed-by: Yann E. MORIN Signed-off-by: Julien Olivain --- package/libopenssl/libopenssl.mk | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk index 663e8d9b9f..c1c5b818d7 100644 --- a/package/libopenssl/libopenssl.mk +++ b/package/libopenssl/libopenssl.mk @@ -132,26 +132,24 @@ endef LIBOPENSSL_POST_CONFIGURE_HOOKS += LIBOPENSSL_FIXUP_STATIC_MAKEFILE endif -# Parallel build broken: https://github.com/openssl/openssl/issues/27074 define HOST_LIBOPENSSL_BUILD_CMDS - $(HOST_MAKE_ENV) $(MAKE1) -C $(@D) + $(HOST_MAKE_ENV) $(MAKE) -C $(@D) endef -# Parallel build broken: https://github.com/openssl/openssl/issues/27074 define LIBOPENSSL_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE1) -C $(@D) + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) endef define LIBOPENSSL_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE1) -C $(@D) DESTDIR=$(STAGING_DIR) install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) install endef define HOST_LIBOPENSSL_INSTALL_CMDS - $(HOST_MAKE_ENV) $(MAKE1) -C $(@D) install + $(HOST_MAKE_ENV) $(MAKE) -C $(@D) install endef define LIBOPENSSL_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE1) -C $(@D) DESTDIR=$(TARGET_DIR) install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install $(RM) -rf $(TARGET_DIR)/usr/lib/ssl $(RM) -f $(TARGET_DIR)/usr/bin/c_rehash endef