diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-11-11 14:42:13 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-11-18 14:27:40 -0600 |
| commit | 88e65df2e4be47ae3ae1ae1b3a30003f4cfe4b11 (patch) | |
| tree | 320c7d09ddf863a23b49aeef455372f15fb41159 /external/curl/ExternalPackage_curl.mk | |
| parent | 6a826ddc4ee40a9727131cd4b13365bf6ae16319 (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 'external/curl/ExternalPackage_curl.mk')
| -rw-r--r-- | external/curl/ExternalPackage_curl.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/external/curl/ExternalPackage_curl.mk b/external/curl/ExternalPackage_curl.mk index fa8b3251c045..6e3c7fd83c8a 100644 --- a/external/curl/ExternalPackage_curl.mk +++ b/external/curl/ExternalPackage_curl.mk @@ -16,11 +16,11 @@ ifneq ($(DISABLE_DYNLOADING),TRUE) ifeq ($(OS)$(COM),WNTGCC) $(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.dll,lib/.libs/libcurl.dll)) else ifeq ($(COM),MSC) -$(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.dll,lib/libcurl.dll)) +$(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl$(if $(MSVC_USE_DEBUG_RUNTIME),d).dll,lib/libcurl$(if $(MSVC_USE_DEBUG_RUNTIME),d).dll)) else ifeq ($(OS),AIX) $(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.so,lib/.libs/libcurl.so.4)) else -$(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.so.4,lib/.libs/libcurl.so.4.2.0)) +$(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.so.4,lib/.libs/libcurl.so.4.3.0)) endif endif # $(DISABLE_DYNLOADING) |