diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2014-05-19 19:48:35 +0200 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2014-05-19 19:58:54 +0200 |
| commit | e175eb3cedded28909247f4d46f2c17ff2f58be2 (patch) | |
| tree | 841294bd60db85930acbc1d40c81a009ab8f5dcd /external/openssl | |
| parent | 36f58d4dd1ee5ebe220a5e1e7d1b28aeb15b8977 (diff) | |
fdo#77891 fix python crash when in GUI mode, target WinXP with VS2012
VS2012 did change return value of fileno function, this results in a
crash when run in GUI mode (but not when launching from a shell), as
python tries to access the nonexisting stdin/stdout/stderr
Also explicitly target Windows XP
Change-Id: Ic783713b55453f3c38b2e766a664b7f4678711de
Diffstat (limited to 'external/openssl')
| -rw-r--r-- | external/openssl/UnpackedTarball_openssl.mk | 1 | ||||
| -rw-r--r-- | external/openssl/openssl-1.0.1g-msvc2012-winxp.patch.1 | 20 |
2 files changed, 21 insertions, 0 deletions
diff --git a/external/openssl/UnpackedTarball_openssl.mk b/external/openssl/UnpackedTarball_openssl.mk index cec09d28f5e9..2509960a12c3 100644 --- a/external/openssl/UnpackedTarball_openssl.mk +++ b/external/openssl/UnpackedTarball_openssl.mk @@ -94,6 +94,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,openssl,\ $(if $(filter LINUX FREEBSD ANDROID,$(OS)),external/openssl/openssllnx.patch) \ $(if $(filter WNTGCC,$(OS)$(COM)),external/openssl/opensslmingw.patch) \ $(if $(filter MSC,$(COM)),external/openssl/opensslwnt.patch) \ + $(if $(filter MSC,$(COM)),external/openssl/openssl-1.0.1g-msvc2012-winxp.patch.1) \ $(if $(filter SOLARIS,$(OS)),external/openssl/opensslsol.patch) \ $(if $(filter IOS,$(OS)),external/openssl/opensslios.patch) \ )) diff --git a/external/openssl/openssl-1.0.1g-msvc2012-winxp.patch.1 b/external/openssl/openssl-1.0.1g-msvc2012-winxp.patch.1 new file mode 100644 index 000000000000..611ffbcd67f3 --- /dev/null +++ b/external/openssl/openssl-1.0.1g-msvc2012-winxp.patch.1 @@ -0,0 +1,20 @@ +--- openssl.org/util/pl/VC-32.pl 2014-05-18 23:41:39.336594400 +0200 ++++ openssl/util/pl/VC-32.pl 2014-05-18 23:47:40.055279300 +0200 +@@ -49,7 +49,7 @@ + $lib_cflag='/Zl' if (!$shlib); # remove /DEFAULTLIBs from static lib + $opt_cflags=$f.' /Ox'; + $dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG'; +- $lflags="/nologo /subsystem:console /opt:ref"; ++ $lflags="/nologo /subsystem:console,5.02 /opt:ref"; + + *::perlasm_compile_target = sub { + my ($target,$source,$bname)=@_; +@@ -131,7 +131,7 @@ + $ff = "/fixed"; + $opt_cflags=$f.' -Ox -O2 -Ob2'; + $dbg_cflags=$f.'d -Od -DDEBUG -D_DEBUG'; +- $lflags="/nologo /subsystem:console /opt:ref"; ++ $lflags="/nologo /subsystem:console,5.01 /opt:ref"; + } + $mlflags=''; + |