diff options
| author | Michael Stahl <mstahl@redhat.com> | 2017-05-30 16:52:37 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-05-30 20:19:21 +0200 |
| commit | ae286726dd223651f9b8bded18f609e2fe09c626 (patch) | |
| tree | 990760e8b98415cf2438756a61866a9a776d1d8a /external/curl | |
| parent | 713ed7b338b467b176af7eb5e9a80559b8496e8e (diff) | |
curl: remove curl-xp.patch.1
Change-Id: I329289c97b857370852c982a8b74b739b9ac3d78
Diffstat (limited to 'external/curl')
| -rw-r--r-- | external/curl/ExternalProject_curl.mk | 2 | ||||
| -rw-r--r-- | external/curl/UnpackedTarball_curl.mk | 1 | ||||
| -rw-r--r-- | external/curl/curl-xp.patch.1 | 12 |
3 files changed, 1 insertions, 14 deletions
diff --git a/external/curl/ExternalProject_curl.mk b/external/curl/ExternalProject_curl.mk index f57efc07fd73..70de689dd0c7 100644 --- a/external/curl/ExternalProject_curl.mk +++ b/external/curl/ExternalProject_curl.mk @@ -66,7 +66,7 @@ $(call gb_ExternalProject_get_state_target,curl,build): $(call gb_ExternalProject_run,build,\ 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) \ + EXCFLAGS="/EHs /D_CRT_SECURE_NO_DEPRECATE /DUSE_WINDOWS_SSPI $(SOLARINC)" $(if $(filter X86_64,$(CPUNAME)),MACHINE=X64) \ ,lib) endif diff --git a/external/curl/UnpackedTarball_curl.mk b/external/curl/UnpackedTarball_curl.mk index 3e88d5f771f1..de252469fcc2 100644 --- a/external/curl/UnpackedTarball_curl.mk +++ b/external/curl/UnpackedTarball_curl.mk @@ -21,7 +21,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,curl,\ external/curl/curl-msvc.patch.1 \ external/curl/curl-msvc-schannel.patch.1 \ external/curl/curl-7.26.0_win-proxy.patch \ - external/curl/curl-xp.patch.1 \ )) ifeq ($(SYSTEM_NSS),) diff --git a/external/curl/curl-xp.patch.1 b/external/curl/curl-xp.patch.1 deleted file mode 100644 index 9e4163e3eab1..000000000000 --- a/external/curl/curl-xp.patch.1 +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur curl.org/src/Makefile.vc10 curl/src/Makefile.vc10 ---- curl.org/src/Makefile.vc10 2016-07-04 03:45:24.102995951 +0200 -+++ curl/src/Makefile.vc10 2016-07-04 03:48:00.547835559 +0200 -@@ -127,7 +127,7 @@ - LINKD = link.exe /incremental:yes /debug /libpath:"../lib"
- RCD = rc.exe /dDEBUGBUILD=1
-
--CFLAGS = /I../lib /I../include /nologo /W3 /EHsc /DWIN32 /FD /c /D_BIND_TO_CURRENT_VCLIBS_VERSION=1
-+CFLAGS = /I../lib /I../include /nologo /W3 /EHsc /DWIN32 /FD /c /D_BIND_TO_CURRENT_VCLIBS_VERSION=1 /D_WIN32_WINNT=0x0502
- LFLAGS = /nologo /out:$(PROGRAM_NAME) /subsystem:console /machine:$(MACHINE)
- RESFLAGS = /i../include
-
|