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/UnpackedTarball_openssl.mk | |
| parent | sw doc model xml dump: handle SwDoc::mpFrmFmtTbl (diff) | |
| download | core-e175eb3cedded28909247f4d46f2c17ff2f58be2.tar.gz core-e175eb3cedded28909247f4d46f2c17ff2f58be2.zip | |
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/UnpackedTarball_openssl.mk')
| -rw-r--r-- | external/openssl/UnpackedTarball_openssl.mk | 1 |
1 files changed, 1 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) \ )) |