diff options
| author | Michael Stahl <mstahl@redhat.com> | 2017-10-23 17:43:21 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-10-24 10:09:07 +0200 |
| commit | 89b08e23180c242a058653e246ace2ca47b56a3a (patch) | |
| tree | a9143a6e318fe2d95943966fbca8d09b2e29ec3f /RepositoryExternal.mk | |
| parent | rework TestImportXLS to take a SvStream arg (diff) | |
| download | core-89b08e23180c242a058653e246ace2ca47b56a3a.tar.gz core-89b08e23180c242a058653e246ace2ca47b56a3a.zip | |
curl: upgrade to release 7.56.1
- fixes a very minor CVE: CVE-2017-1000254
- the Windows nmakefiles we were previously using have been
removed, so we use the *other* Windows nmake build system now
- /EHs override is pointless, default /EHsc should work fine
- the macros defined in ExternalProject are not needed any more
- curl-msvc-schannel.patch.1: drop, not needed with new makefiles
- curl-osx.patch.1: none of it applies, presumably fixed upstream
Change-Id: I15c71b9c82c31d286d935b57543a1b0216123b66
Reviewed-on: https://gerrit.libreoffice.org/43724
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index b1642dea4ca6..f1f39de76f3b 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2711,7 +2711,7 @@ $(call gb_LinkTarget_set_include,$(1),\ ifeq ($(COM),MSC) $(call gb_LinkTarget_add_libs,$(1),\ - $(call gb_UnpackedTarball_get_dir,curl)/lib/$(if $(MSVC_USE_DEBUG_RUNTIME),debug-dll,release-dll)/libcurl$(if $(MSVC_USE_DEBUG_RUNTIME),d)_imp.lib \ + $(call gb_UnpackedTarball_get_dir,curl)/builds/libcurl-vc12-$(if $(filter X86_64,$(CPUNAME)),x64,x86)-$(if $(MSVC_USE_DEBUG_RUNTIME),debug,release)-dll-ipv6-sspi-winssl/lib/libcurl$(if $(MSVC_USE_DEBUG_RUNTIME),_debug).lib \ ) else $(call gb_LinkTarget_add_libs,$(1),\ |