From: Peter Korsgaard <peter@korsgaard.com>
To: "Yann E . MORIN" <yann.morin.1998@free.fr>, buildroot@buildroot.org
Subject: [Buildroot] [PATCH 2/2] Revert "package/libopenssl do not build in parallel"
Date: Tue, 15 Apr 2025 22:00:47 +0200 [thread overview]
Message-ID: <20250415200047.2256467-2-peter@korsgaard.com> (raw)
In-Reply-To: <20250415200047.2256467-1-peter@korsgaard.com>
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 <peter@korsgaard.com>
---
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
--
2.39.5
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
next prev parent reply other threads:[~2025-04-15 20:01 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-15 20:00 [Buildroot] [PATCH 1/2] package/libopenssl: add (proposed) upstream fix for parallel installation Peter Korsgaard
2025-04-15 20:00 ` Peter Korsgaard [this message]
2025-04-15 20:15 ` [Buildroot] [PATCH 2/2] Revert "package/libopenssl do not build in parallel" Yann E. MORIN
2025-04-15 20:30 ` Peter Korsgaard
2025-04-15 20:09 ` [Buildroot] [PATCH 1/2] package/libopenssl: add (proposed) upstream fix for parallel installation Yann E. MORIN
2025-04-15 21:40 ` Julien Olivain
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250415200047.2256467-2-peter@korsgaard.com \
--to=peter@korsgaard.com \
--cc=buildroot@buildroot.org \
--cc=yann.morin.1998@free.fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox