[Buildroot] [PATCH 2/2] Revert "package/libopenssl do not build in parallel"

[Yann E. MORIN]

Pter, All,

On 2025-04-15 22:00 +0200, Peter Korsgaard spake thusly:
> This reverts commit 27ab880ebb9a3efdec15733841f7b88063604247.

I don't think this really is a "revert". Reverting a commit is for when
that commit was wrong when it was applied. But here, the commit was not
wrong, so it should not be "reverted". Even if the change is technically
undone, that's semantically a different thing. But oh well... ;-)

> 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.

Yes, that was a shame that we had to lose parallelism...

Note that I also hit a hihly-parallel highly-loaded build (not install)
issue that is still not fixed. Alas, that one is also very, very
difficult to hit. We can probably ignore it until I get bitten again and
get more traces to inspect...

> Signed-off-by: Peter Korsgaard <peter at korsgaard.com>

Reviewed-by: Yann E. MORIN <yann.morin.1998 at free.fr>

Regards,
Yann E. MORIN.

> ---
>  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
> 

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'