download.lst | 4 ++-- solenv/gbuild/platform/com_MSC_class.mk | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-)
New commits: commit c1ba4bcef46433fe130ce36639d3cfead1b8b8d1 Author: Mike Kaganski <[email protected]> AuthorDate: Fri Feb 16 13:43:20 2024 +0600 Commit: Christian Lohmaier <[email protected]> CommitDate: Sat Feb 17 14:00:54 2024 +0100 OpenSSL: upgrade to 3.0.13 Change-Id: Ib03c99a2dbf0f7c932b8a6b953ac9eb9c43f978f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163493 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <[email protected]> (cherry picked from commit a268b95d73911f1b92482c4b06d480cfd6eeb0dc) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163534 Tested-by: Christian Lohmaier <[email protected]> diff --git a/download.lst b/download.lst index 7392c9efb737..63ad7a6b91d2 100644 --- a/download.lst +++ b/download.lst @@ -423,8 +423,8 @@ OPENLDAP_TARBALL := openldap-2.6.6.tgz # three static lines # so that git cherry-pick # will not run into conflicts -OPENSSL_SHA256SUM := b3425d3bb4a2218d0697eb41f7fc0cdede016ed19ca49d168b78e8d947887f55 -OPENSSL_TARBALL := openssl-3.0.11.tar.gz +OPENSSL_SHA256SUM := 88525753f79d3bec27d2fa7c66aa0b92b3aa9498dafd93d7cfa4b3780cdae313 +OPENSSL_TARBALL := openssl-3.0.13.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts commit 755bafba7ea3642df99ca0bd2b77e608ffa3e4d3 Author: Hossein <[email protected]> AuthorDate: Thu May 25 15:55:11 2023 +0200 Commit: Christian Lohmaier <[email protected]> CommitDate: Sat Feb 17 14:00:43 2024 +0100 tdf#155446 Fix problem with ccache on Windows This patch fixes the recent problem with building LibreOffice with ccache on Windows which was caused by the lack of double quotation mark between ccache.exe and path to the MSVC compiler. Change-Id: I1a714513ccb8cd674895d0c887013ea862d3b544 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152277 Tested-by: Jenkins Reviewed-by: Hossein <[email protected]> (cherry picked from commit 0c9f095a01682d8cb99a596e568bd81ae96906a5) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163505 Reviewed-by: Xisco Fauli <[email protected]> (cherry picked from commit aeca67238e26cd148083055e0f223753f7462c14) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163530 Tested-by: Christian Lohmaier <[email protected]> Reviewed-by: Christian Lohmaier <[email protected]> diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index ba42b0ba48df..d8cab84ff7c7 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -179,7 +179,7 @@ define gb_AsmObject__command $(call gb_Output_announce,$(2),$(true),ASM,3) $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) $(dir $(4)) && \ - "$(CC)" -nologo -EP -D_M_ARM64 $(SOLARINC) $(3) > $(subst .o,.asm,$(1)) && \ + $(CC) -nologo -EP -D_M_ARM64 $(SOLARINC) $(3) > $(subst .o,.asm,$(1)) && \ "$(ML_EXE)" $(gb_AFLAGS) -g -errorReport:prompt -o $(1) $(subst .o,.asm,$(1)), \ ) && \ echo "$(1) : $(3)" > $(4) @@ -664,8 +664,12 @@ gb_AUTOCONF_WRAPPERS = \ gb_ExternalProject_INCLUDE := \ $(subst -I,,$(subst $(WHITESPACE),;,$(SOLARINC))) +# Workaround for openssl build - it puts the CC var into additional pair of quotes. This breaks if +# CC consists of more than a single element such as when using "ccache compiler". In case the +# variables are exported for openssl, it closes and reopens the quotes after each element. gb_NMAKE_VARS = \ - CC="$(shell cygpath -w $(filter-out -%,$(CC))) $(filter -%,$(CC))" \ + CC="$(subst $(WHITESPACE),$(if $(filter openssl,$(1)),\" \", ),$(strip \ + $(shell cygpath -ws $(filter-out -%,$(CC))) $(filter -%,$(CC))))" \ INCLUDE="$(gb_ExternalProject_INCLUDE)" \ LIB="$(ILIB)" \ MAKEFLAGS= \
