diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-11-02 11:48:21 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-11-02 19:11:14 +0000 |
| commit | 3edb365f2651848ae8bc3b85bf0b56bd00d93270 (patch) | |
| tree | 42005cf2a6a850030f698a41ca69afe339f37aeb /external/curl/ExternalProject_curl.mk | |
| parent | upgrade to ICU 58 (diff) | |
| download | core-3edb365f2651848ae8bc3b85bf0b56bd00d93270.tar.gz core-3edb365f2651848ae8bc3b85bf0b56bd00d93270.zip | |
curl: upgrade to version 7.51.0
- fixes about a dozen CVEs
- tweak curl-7.26.0_win-proxy.patch:
there is a "checksrc" thing now in curl that fails the build with:
warning: use of strtok is banned (BANNEDFUNC)
so use strtok_s instead (which is MSVC's name for standard strtok_r)
- use Makefile.vc12 instead of Makefile.vc10
- remove strequal.obj from Makefile.vc12, it does not actually exist
Change-Id: Ie2da64980d88c72b0c902376ffc01abf97a7bc91
Reviewed-on: https://gerrit.libreoffice.org/30484
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'external/curl/ExternalProject_curl.mk')
| -rw-r--r-- | external/curl/ExternalProject_curl.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/external/curl/ExternalProject_curl.mk b/external/curl/ExternalProject_curl.mk index 8446d82f4e71..76b4a4556103 100644 --- a/external/curl/ExternalProject_curl.mk +++ b/external/curl/ExternalProject_curl.mk @@ -79,7 +79,7 @@ else ifeq ($(COM),MSC) $(call gb_ExternalProject_get_state_target,curl,build): $(call gb_ExternalProject_run,build,\ - MAKEFLAGS= LIB="$(ILIB)" nmake -f Makefile.vc10 \ + MAKEFLAGS= LIB="$(ILIB)" nmake -f Makefile.vc12 \ cfg=$(if $(MSVC_USE_DEBUG_RUNTIME),debug-dll,release-dll) \ EXCFLAGS="/EHs /D_CRT_SECURE_NO_DEPRECATE /DUSE_WINDOWS_SSPI /D_USING_V110_SDK71_ $(SOLARINC)" $(if $(filter X86_64,$(CPUNAME)),MACHINE=X64) \ ,lib) |