From 84c80da9751c2d89655b0cfdda2f7ad581d1b15e Mon Sep 17 00:00:00 2001 From: Christian Lohmaier Date: Fri, 19 Apr 2024 11:39:58 +0200 Subject: [PATCH] use strawberry perl in wsl-as-helper case for openssl it needs modules that are not available in git-bash perl, and strawberry perl is already used as a way to get windres and similar utilities Might want to revisit that to streamline the dependencies Change-Id: Ieb1c83831292677e9930d376d9d71283c6a1140e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166342 Tested-by: Jenkins Reviewed-by: Christian Lohmaier --- external/openssl/ExternalProject_openssl.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/external/openssl/ExternalProject_openssl.mk b/external/openssl/ExternalProject_openssl.mk index 048158700f84..910c957484c4 100644 --- a/external/openssl/ExternalProject_openssl.mk +++ b/external/openssl/ExternalProject_openssl.mk @@ -62,11 +62,12 @@ OPENSSL_PLATFORM := \ ifeq ($(COM),MSC) $(eval $(call gb_ExternalProject_use_nmake,openssl,build)) +$(call gb_ExternalProject_get_state_target,openssl,build): export PERL:=$(if $(MSYSTEM),$(STRAWBERRY_PERL),$(shell cygpath -m $(PERL))) + $(call gb_ExternalProject_get_state_target,openssl,build): $(call gb_Trace_StartRange,openssl,EXTERNAL) $(call gb_ExternalProject_run,build,\ CONFIGURE_INSIST=1 $(PERL) Configure $(OPENSSL_PLATFORM) no-tests no-multilib \ - && export PERL="$(shell cygpath -w $(PERL))" \ && nmake -f makefile \ $(if $(call gb_Module__symbols_enabled,openssl),DEBUG_FLAGS_VALUE="$(gb_DEBUGINFO_FLAGS)") \ )