download.lst | 4 ++--
external/openssl/UnpackedTarball_openssl.mk | 1 +
external/openssl/openssl-fix-CC.patch.0 | 12 ++++++++++++
3 files changed, 15 insertions(+), 2 deletions(-)
New commits:
commit 1d1a321a02f307b5639dd54f199f50b028cfc368
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Fri Feb 16 13:43:20 2024 +0600
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Tue Feb 20 08:28:58 2024 +0100
OpenSSL: upgrade to 3.0.13
Special on this branch: openssl-fix-CC.patch.0
I do not know why, but without this the build fails,
because
CC="C:\PROGRA~2\MICROS~2�9\COMMUN~1\VC\Tools\MSVCb9~1.301in\Hostx64\x64
instead of
CC="C:\PROGRA~2\MICROS~2�9\COMMUN~1\VC\Tools\MSVCb9~1.301in\Hostx64\x64
note the trailing space. And then util/mkbuildinf.pl gets wrong parameters,
buildinf.h is
generated wrongly, and later build fails.
Change-Id: Ib03c99a2dbf0f7c932b8a6b953ac9eb9c43f978f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163475
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
(cherry picked from commit 4897792975453024db8369c3d8c5f2e65c956d73)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163497
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163521
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/download.lst b/download.lst
index 07fa9cbd0983..1145fa8d08e1 100644
--- a/download.lst
+++ b/download.lst
@@ -487,8 +487,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
diff --git a/external/openssl/UnpackedTarball_openssl.mk
b/external/openssl/UnpackedTarball_openssl.mk
index 2a8f3bb3f905..fad807a5543b 100644
--- a/external/openssl/UnpackedTarball_openssl.mk
+++ b/external/openssl/UnpackedTarball_openssl.mk
@@ -16,6 +16,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,openssl,\
external/openssl/configurable-z-option.patch.0 \
external/openssl/openssl-no-ipc-cmd.patch.0 \
external/openssl/system-cannot-find-path-for-move.patch.0 \
+ external/openssl/openssl-fix-CC.patch.0 \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/openssl/openssl-fix-CC.patch.0
b/external/openssl/openssl-fix-CC.patch.0
new file mode 100644
index 000000000000..e3a7fbd775b6
--- /dev/null
+++ b/external/openssl/openssl-fix-CC.patch.0
@@ -0,0 +1,12 @@
+--- Configurations/windows-makefile.tmpl.orig 2024-02-19
21:02:37.162066700 +0000
++++ Configurations/windows-makefile.tmpl 2024-02-19 21:03:59.208212100 +0000
+@@ -251,7 +251,7 @@
+
+ ##### User defined commands and flags ################################
+
+-CC="{- $config{CC} -}"
++CC={- $config{CC} -}
+ CPP={- $config{CPP} -}
+ CPPFLAGS={- our $cppflags1 = join(" ",
+ (map { "-D".$_} @{$config{CPPDEFINES}}),
+
