diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2016-07-04 03:53:03 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2016-07-07 02:09:26 +0000 |
| commit | 8562b1068328e16a629d2397f00af2a3e7998081 (patch) | |
| tree | 42aa00cb3f8df5b49fd6f7c0fd95587128f900ba | |
| parent | 7645c3dff0e81b018a665148814412765e28502e (diff) | |
tdf#100295 force curl to build for XP
Change-Id: Ia705704bc80a951f0da04936783dd8965bda842b
Reviewed-on: https://gerrit.libreoffice.org/26886
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit dc4797a79e3f465e1fa930be7c69d8ec7d91c15e)
Reviewed-on: https://gerrit.libreoffice.org/26988
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
| -rw-r--r-- | external/curl/UnpackedTarball_curl.mk | 1 | ||||
| -rw-r--r-- | external/curl/curl-xp.patch.1 | 12 |
2 files changed, 13 insertions, 0 deletions
diff --git a/external/curl/UnpackedTarball_curl.mk b/external/curl/UnpackedTarball_curl.mk index 8e236b4a9765..154263ce914f 100644 --- a/external/curl/UnpackedTarball_curl.mk +++ b/external/curl/UnpackedTarball_curl.mk @@ -23,6 +23,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,curl,\ external/curl/curl-msvc-schannel.patch.1 \ external/curl/curl-7.26.0_mingw.patch \ 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 new file mode 100644 index 000000000000..9e4163e3eab1 --- /dev/null +++ b/external/curl/curl-xp.patch.1 @@ -0,0 +1,12 @@ +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
+
|