89b08e2318
- fixes a very minor CVE: CVE-2017-1000254 - the Windows nmakefiles we were previously using have been removed, so we use the *other* Windows nmake build system now - /EHs override is pointless, default /EHsc should work fine - the macros defined in ExternalProject are not needed any more - curl-msvc-schannel.patch.1: drop, not needed with new makefiles - curl-osx.patch.1: none of it applies, presumably fixed upstream Change-Id: I15c71b9c82c31d286d935b57543a1b0216123b66 Reviewed-on: https://gerrit.libreoffice.org/43724 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
28 lines
1.1 KiB
Groff
28 lines
1.1 KiB
Groff
MSVC: using SOLARINC
|
|
|
|
--- curl/winbuild/MakefileBuild.vc.orig 2017-10-23 16:36:07.713550851 +0200
|
|
+++ curl/winbuild/MakefileBuild.vc 2017-10-23 16:38:19.301547594 +0200
|
|
@@ -60,7 +60,7 @@
|
|
!ELSE
|
|
CC_NODEBUG = $(CC) /O2 /DNDEBUG
|
|
CC_DEBUG = $(CC) /Od /D_DEBUG /RTC1 /Z7 /LDd
|
|
-CFLAGS = /I. /I ../lib /I../include /nologo /W4 /wd4127 /EHsc /DWIN32 /FD /c /DBUILDING_LIBCURL
|
|
+CFLAGS = /I. /I ../lib /I../include /nologo /W4 /wd4127 /EHsc /DWIN32 /FD /c /DBUILDING_LIBCURL $(SOLARINC)
|
|
!ENDIF
|
|
|
|
LFLAGS = /nologo /machine:$(MACHINE)
|
|
@@ -300,11 +300,11 @@
|
|
# CURL_XX macros are for the curl.exe command
|
|
|
|
!IF "$(DEBUG)"=="yes"
|
|
-RC_FLAGS = /dDEBUGBUILD=1 /Fo $@ $(LIBCURL_SRC_DIR)\libcurl.rc
|
|
+RC_FLAGS = $(SOLARINC) /dDEBUGBUILD=1 /Fo $@ $(LIBCURL_SRC_DIR)\libcurl.rc
|
|
CURL_CC = $(CC_DEBUG) $(RTLIB_DEBUG)
|
|
CURL_RC_FLAGS = /i../include /dDEBUGBUILD=1 /Fo $@ $(CURL_SRC_DIR)\curl.rc
|
|
!ELSE
|
|
-RC_FLAGS = /dDEBUGBUILD=0 /Fo $@ $(LIBCURL_SRC_DIR)\libcurl.rc
|
|
+RC_FLAGS = $(SOLARINC) /dDEBUGBUILD=0 /Fo $@ $(LIBCURL_SRC_DIR)\libcurl.rc
|
|
CURL_CC = $(CC_NODEBUG) $(RTLIB)
|
|
CURL_RC_FLAGS = /i../include /dDEBUGBUILD=0 /Fo $@ $(CURL_SRC_DIR)\curl.rc
|
|
!ENDIF
|