summaryrefslogtreecommitdiff
path: root/RepositoryExternal.mk
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-11-11 14:42:13 +0100
committerMichael Stahl <mstahl@redhat.com>2013-11-18 14:27:40 -0600
commit88e65df2e4be47ae3ae1ae1b3a30003f4cfe4b11 (patch)
tree320c7d09ddf863a23b49aeef455372f15fb41159 /RepositoryExternal.mk
parent6a826ddc4ee40a9727131cd4b13365bf6ae16319 (diff)
curl: upgrade to version 7.33.0
- from curl-7.26.0.patch: * drop ADDCFLAGS stuff, must be some dmake relic * drop wspiapi.h, presumably for backward compat with NT 5.0/Win2000 which is unsupported (and ws2_32.lib is linked anyway...) * split out curl-freebsd.patch.1 - curl-7.26.0_win.patch: * drop the library renaming stuff - can be handled in Package and RepositoryExternal.mk without patch * rename the rest to curl-msvc.patch.1 - drop curl-aix.patch: presumably don't need special check for V7BETA since it's released now - drop curl-7.26.0_strlcat.patch (obsolete) Change-Id: Ie8c1d9e72f82ada95f42c49d22d90e43b1a6c3c0 Reviewed-on: https://gerrit.libreoffice.org/6642 Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'RepositoryExternal.mk')
-rw-r--r--RepositoryExternal.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 3dcca01391c5..97d4bbf12311 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2025,7 +2025,7 @@ $(call gb_LinkTarget_set_include,$(1),\
ifeq ($(COM),MSC)
$(call gb_LinkTarget_add_libs,$(1),\
- $(call gb_UnpackedTarball_get_dir,curl)/lib/libcurl.lib \
+ $(call gb_UnpackedTarball_get_dir,curl)/lib/libcurl$(if $(MSVC_USE_DEBUG_RUNTIME),d)_imp.lib \
)
else
$(call gb_LinkTarget_add_libs,$(1),\