cb0c7e26e5
Fixes CVE-2020-8169, and about 3 other ones that don't affect LO/libcmis. Disable new optional dependencies "ngtcp2" and "quiche". Change-Id: I595ed909c4e792ac3244643511a338b117e7f102 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97406 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
27 lines
1.2 KiB
Groff
27 lines
1.2 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 /EHsc /DWIN32 /FD /c /DBUILDING_LIBCURL
|
|
+CFLAGS = /I. /I ../lib /I../include /nologo /W4 /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 = $(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 = $(CURL_RC_FLAGS) /i../include /dDEBUGBUILD=0 /Fo $@ $(CURL_SRC_DIR)\curl.rc
|
|
!ENDIF
|