download.lst | 4 ++--
external/openssl/configurable-z-option.patch.0 | 14 +++++++-------
solenv/gbuild/platform/com_MSC_class.mk | 8 ++++++--
3 files changed, 15 insertions(+), 11 deletions(-)
New commits:
commit 0fcfdeb2dc10489902b33fb4aa744bd7f42f5d3c
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Fri Feb 16 13:43:20 2024 +0600
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Fri Feb 16 21:36:49 2024 +0600
OpenSSL: upgrade to 3.0.13
Change-Id: Ib03c99a2dbf0f7c932b8a6b953ac9eb9c43f978f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163475
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/download.lst b/download.lst
index 1fdb060c3bdf..be41dc9340a9 100644
--- a/download.lst
+++ b/download.lst
@@ -419,8 +419,8 @@ OPENLDAP_TARBALL := openldap-2.4.59.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 48803bad449e180131d12237038c50b2c28c6168
Author: Hossein <hoss...@libreoffice.org>
AuthorDate: Thu May 25 15:55:11 2023 +0200
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Fri Feb 16 21:36:41 2024 +0600
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 <hoss...@libreoffice.org>
diff --git a/solenv/gbuild/platform/com_MSC_class.mk
b/solenv/gbuild/platform/com_MSC_class.mk
index 157edc310f72..afa77d1d0032 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)
@@ -663,8 +663,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= \
commit d4b91d5691d0add92d909b568bfff46c157fb27d
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sat Sep 30 23:54:06 2023 +0900
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Fri Feb 16 20:51:35 2024 +0600
openssl: upgrade to release 3.0.11
Change-Id: I80c6fde3b6ae526f46b6bc346f09b287cc88b032
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157433
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>
(cherry picked from commit d059aebd99f717d846e7746d5ff5b99d507a3160)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157466
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/download.lst b/download.lst
index c6c48cd7dd84..1fdb060c3bdf 100644
--- a/download.lst
+++ b/download.lst
@@ -419,8 +419,8 @@ OPENLDAP_TARBALL := openldap-2.4.59.tgz
# three static lines
# so that git cherry-pick
# will not run into conflicts
-OPENSSL_SHA256SUM :=
1761d4f5b13a1028b9b6f3d4b8e17feb0cedc9370f6afe61d7193d2cdce83323
-OPENSSL_TARBALL := openssl-3.0.10.tar.gz
+OPENSSL_SHA256SUM :=
b3425d3bb4a2218d0697eb41f7fc0cdede016ed19ca49d168b78e8d947887f55
+OPENSSL_TARBALL := openssl-3.0.11.tar.gz
# three static lines
# so that git cherry-pick
# will not run into conflicts
diff --git a/external/openssl/configurable-z-option.patch.0
b/external/openssl/configurable-z-option.patch.0
index 9a4426edd5d2..d9478b6a9701 100644
--- a/external/openssl/configurable-z-option.patch.0
+++ b/external/openssl/configurable-z-option.patch.0
@@ -1,15 +1,15 @@
---- Configurations/10-main.conf.sav 2021-08-24 13:38:47.000000000 +0000
-+++ Configurations/10-main.conf 2021-11-02 22:20:44.377653700 +0000
-@@ -13,7 +13,7 @@
+--- Configurations/10-main.conf.sav 2023-09-19 22:02:31.000000000 +0900
++++ Configurations/10-main.conf 2023-09-30 23:47:49.734377000 +0900
+@@ -14,7 +14,7 @@
} elsif ($disabled{asm}) {
# assembler is still used to compile uplink shim
$vc_win64a_info = { AS => "ml64",
- ASFLAGS => "/nologo /Zi",
+ ASFLAGS => "/nologo $$(DEBUG_FLAGS_VALUE)",
asflags => "/c /Cp /Cx",
- asoutflag => "/Fo" };
- } else {
-@@ -41,7 +41,7 @@
+ asoutflag => "/Fo",
+ perlasm_scheme => "masm" };
+@@ -44,7 +44,7 @@
} elsif ($disabled{asm}) {
# not actually used, uplink shim is inlined into C code
$vc_win32_info = { AS => "ml",
@@ -18,7 +18,7 @@
asflags => "/Cp /coff /c /Cx",
asoutflag => "/Fo",
perlasm_scheme => "win32" };
-@@ -1323,10 +1323,10 @@
+@@ -1333,10 +1333,10 @@
"UNICODE", "_UNICODE",
"_CRT_SECURE_NO_DEPRECATE",
"_WINSOCK_DEPRECATED_NO_WARNINGS"),
