[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnurl] 67/208: winbuild: fix boringssl build
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnurl] 67/208: winbuild: fix boringssl build |
Date: |
Wed, 09 Aug 2017 17:34:24 +0200 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to annotated tag gnurl-7.55.0
in repository gnurl.
commit cd34ffa614b04ed6ab6533fa3b8661f0ef9abfa9
Author: Henrik S. Gaßmann <address@hidden>
AuthorDate: Sat Jun 24 11:55:21 2017 +0200
winbuild: fix boringssl build
Compile with `WIN32_LEAN_AND_MEAN` which prevents `windows.h` from
including too much clutter including `wincrypt.h` which in turn contains
some preprocessor macros that clash with boringssl symbols.
Detect boringssl by checking the existance of `is_boringssl.h` and set
the corresponding `HAVE_BORINGSSL` for compilation which is used in
`ldap.c` to undefine the evil macros.
Closes #1610
---
winbuild/MakefileBuild.vc | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/winbuild/MakefileBuild.vc b/winbuild/MakefileBuild.vc
index 83f92374e..eb28efefd 100644
--- a/winbuild/MakefileBuild.vc
+++ b/winbuild/MakefileBuild.vc
@@ -60,7 +60,7 @@ CFLAGS = /I. /I../lib /I../include /nologo /W3 /GX
/DWIN32 /YX /FD /c /DBUIL
!ELSE
CC_NODEBUG = $(CC) /O2 /DNDEBUG
CC_DEBUG = $(CC) /Od /D_DEBUG /RTC1 /Z7 /LDd /W3
-CFLAGS = /I. /I ../lib /I../include /nologo /W3 /EHsc /DWIN32 /FD /c
/DBUILDING_LIBCURL
+CFLAGS = /I. /I ../lib /I../include /nologo /W3 /EHsc /DWIN32 /FD /c
/DBUILDING_LIBCURL /DWIN32_LEAN_AND_MEAN
!ENDIF
LFLAGS = /nologo /machine:$(MACHINE)
@@ -133,6 +133,9 @@ SSL = static
!IFDEF USE_SSL
SSL_CFLAGS = /DUSE_OPENSSL /I"$(DEVEL_INCLUDE)/openssl"
+!IF EXISTS("$(DEVEL_INCLUDE)\openssl\is_boringssl.h")
+SSL_CFLAGS = $(SSL_CFLAGS) /DHAVE_BORINGSSL
+!ENDIF
!ENDIF
!IF "$(WITH_NGHTTP2)"=="dll"
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnurl] 191/208: test1010: verify that #1718 is fixed, (continued)
- [GNUnet-SVN] [gnurl] 191/208: test1010: verify that #1718 is fixed, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 188/208: travis: BUILD_TYPE => T, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 72/208: libtest/make: generate lib1521.c, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 159/208: test1323: verify curlx_tvdiff, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 42/208: http2: fix OOM crash, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 163/208: tool_help: clarify --include is only for response headers, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 206/208: THANKS: 20 new contributors in 7.55.0, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 183/208: test130: verify comments in .netrc, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 142/208: travis: install libssh2, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 135/208: errno: fix non-windows builds after af0216251b94e7, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 67/208: winbuild: fix boringssl build,
gnunet <=
- [GNUnet-SVN] [gnurl] 168/208: libcurl: Stop using error codes defined under CURL_NO_OLDIES, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 48/208: lib1521: add curl_easy_getinfo calls to the test set, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 184/208: darwinssl: fix curlssl_sha256sum() compiler warnings on first argument, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 198/208: file: output the correct buffer to the user, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 171/208: curl_setup: Define CURL_NO_OLDIES for building libcurl, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 192/208: RELEASE-NOTES: synced with 561e9217c, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 189/208: travis: explicitly specify dist, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 178/208: travis: build osx with libressl too, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 187/208: travis: add osx build with darwinssl, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 139/208: ISSUE_TEMPLATE: Add a comment not to file security issues on github, gnunet, 2017/08/09