diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-04-07 11:51:50 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-04-09 20:25:30 +0000 |
| commit | 04a98015101b8fea3b200e0bf3a2469d8c75fdf7 (patch) | |
| tree | bf9fd2a3de457e05d6802d6d70f56566035632c7 /external/openssl/UnpackedTarball_openssl.mk | |
| parent | initial load of bibliography doesn't set bibliography type (diff) | |
| download | core-04a98015101b8fea3b200e0bf3a2469d8c75fdf7.tar.gz core-04a98015101b8fea3b200e0bf3a2469d8c75fdf7.zip | |
upgrade to openssl-1.0.2a
and de-ifdef-per-platform the patch makefile so an upgrade attempt on one
platform tests the patchs applying on all platforms
ubsan.patch.0 was effectively applied upstream while need
to add http://rt.openssl.org/Ticket/Display.html?id=3650 to build
under windows
Change-Id: Ieffd9bc3dd861a94a083d8b6b8d4117bba7f527c
Reviewed-on: https://gerrit.libreoffice.org/15183
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'external/openssl/UnpackedTarball_openssl.mk')
| -rw-r--r-- | external/openssl/UnpackedTarball_openssl.mk | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/external/openssl/UnpackedTarball_openssl.mk b/external/openssl/UnpackedTarball_openssl.mk index cf5f5ddfd4d2..b44f576e7715 100644 --- a/external/openssl/UnpackedTarball_openssl.mk +++ b/external/openssl/UnpackedTarball_openssl.mk @@ -22,15 +22,15 @@ $(eval $(call gb_UnpackedTarball_set_pre_action,openssl,\ endif $(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 MSC,$(COM)),external/openssl/openssl-1.0.1h-win64.patch.1) \ - $(if $(filter SOLARIS,$(OS)),external/openssl/opensslsol.patch) \ - $(if $(filter IOS,$(OS)),external/openssl/opensslios.patch) \ - $(if $(filter MACOSXPOWERPC,$(OS)$(CPUNAME)),external/openssl/opensslosxppc.patch) \ - external/openssl/ubsan.patch.0 \ + external/openssl/openssllnx.patch \ + external/openssl/opensslmingw.patch \ + external/openssl/opensslwnt.patch \ + external/openssl/openssl-1.0.1g-msvc2012-winxp.patch.1 \ + external/openssl/openssl-1.0.1h-win64.patch.1 \ + external/openssl/opensslsol.patch \ + external/openssl/opensslios.patch \ + external/openssl/opensslosxppc.patch \ + external/openssl/openssl-3650-masm.patch.1 \ )) # vim: set noet sw=4 ts=4: |