diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2024-02-16 13:43:20 +0600 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2024-02-20 08:28:58 +0100 |
| commit | 1d1a321a02f307b5639dd54f199f50b028cfc368 (patch) | |
| tree | 1db6075310406305bb566c5bf5a072104e868a8b /external | |
| parent | 7058ee63c0a3baba177dd719d4b7265cfd3b5ede (diff) | |
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\2019\COMMUN~1\VC\Tools\MSVC\1429~1.301\bin\Hostx64\x64\cl.exe "
instead of
CC="C:\PROGRA~2\MICROS~2\2019\COMMUN~1\VC\Tools\MSVC\1429~1.301\bin\Hostx64\x64\cl.exe"
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.kaganski@collabora.com>
(cherry picked from commit 4897792975453024db8369c3d8c5f2e65c956d73)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163497
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163521
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/openssl/UnpackedTarball_openssl.mk | 1 | ||||
| -rw-r--r-- | external/openssl/openssl-fix-CC.patch.0 | 12 |
2 files changed, 13 insertions, 0 deletions
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}}), + |