[Libreoffice-commits] core.git: external/curl

[Michael Stahl]

 external/curl/ExternalProject_curl.mk     |    2 +-
 external/curl/UnpackedTarball_curl.mk     |    2 +-
 external/curl/curl-7.26.0_win-proxy.patch |    4 ++--
 external/curl/curl-msvc.patch.1           |    4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 43d477b1685f6c1ad48885c7a73411030c78513d
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Nov 18 23:40:05 2013 +0100

    curl: actually use Makefile.vc10 instead of Makefile.vc9
    
    ... they are currently identical but it seems more appropriate.
    
    Change-Id: I5ecd7209bc29f32a2f04299d35364a10fe381a35

diff --git a/external/curl/ExternalProject_curl.mk b/external/curl/ExternalProject_curl.mk
index 6f024bf..81d46f6 100644
--- a/external/curl/ExternalProject_curl.mk
+++ b/external/curl/ExternalProject_curl.mk
@@ -72,7 +72,7 @@ else ifeq ($(COM),MSC)
 
 $(call gb_ExternalProject_get_state_target,curl,build):
 	$(call gb_ExternalProject_run,build,\
-		MAKEFLAGS= LIB="$(ILIB)" nmake -f Makefile.vc9 \
+		MAKEFLAGS= LIB="$(ILIB)" nmake -f Makefile.vc10 \
 			cfg=$(if $(MSVC_USE_DEBUG_RUNTIME),debug-dll,release-dll) \
 			EXCFLAGS="/EHa /Zc:wchar_t- /D_CRT_SECURE_NO_DEPRECATE /DUSE_WINDOWS_SSPI $(SOLARINC)" $(if $(filter X86_64,$(CPUNAME)),MACHINE=X64) \
 	,lib)
diff --git a/external/curl/UnpackedTarball_curl.mk b/external/curl/UnpackedTarball_curl.mk
index 0516a31..05e9aa5 100644
--- a/external/curl/UnpackedTarball_curl.mk
+++ b/external/curl/UnpackedTarball_curl.mk
@@ -14,7 +14,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,curl,$(CURL_TARBALL),,curl))
 $(eval $(call gb_UnpackedTarball_set_patchlevel,curl,1))
 
 $(eval $(call gb_UnpackedTarball_fix_end_of_line,curl,\
-	lib/Makefile.vc9 \
+	lib/Makefile.vc10 \
 ))
 
 $(eval $(call gb_UnpackedTarball_add_patches,curl,\
diff --git a/external/curl/curl-7.26.0_win-proxy.patch b/external/curl/curl-7.26.0_win-proxy.patch
index addb47e..26c42f7 100644
--- a/external/curl/curl-7.26.0_win-proxy.patch
+++ b/external/curl/curl-7.26.0_win-proxy.patch
@@ -1,5 +1,5 @@
---- curl-7.26.0/lib/Makefile.vc9
-+++ misc/build/curl-7.26.0/lib/Makefile.vc9
+--- curl-7.26.0/lib/Makefile.vc10
++++ misc/build/curl-7.26.0/lib/Makefile.vc10
 @@ -116,7 +116,7 @@ LFLAGS     = /nologo /machine:$(MACHINE)
  SSLLIBS      = libeay32.lib ssleay32.lib
  ZLIBLIBSDLL  = zdll.lib
diff --git a/external/curl/curl-msvc.patch.1 b/external/curl/curl-msvc.patch.1
index 42970d3..927b3f1 100644
--- a/external/curl/curl-msvc.patch.1
+++ b/external/curl/curl-msvc.patch.1
@@ -1,7 +1,7 @@
 MSVC: using SOLARINC and EXCFLAGS
 
---- curl/lib/Makefile.vc9	2012-05-24 12:07:02.000000000 -0400
-+++ curl/lib/Makefile.vc9	2012-10-29 11:53:44.658809300 -0400
+--- curl/lib/Makefile.vc10	2012-05-24 12:07:02.000000000 -0400
++++ curl/lib/Makefile.vc10	2012-10-29 11:53:44.658809300 -0400
 @@ -117,7 +117,7 @@
  ZLIBLIBSDLL  = zdll.lib
  ZLIBLIBS     = zlib.lib