[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnurl] 103/151: winbuild: Define CARES_STATICLIB when WITH_CARES=static
From: |
gnunet |
Subject: |
[gnurl] 103/151: winbuild: Define CARES_STATICLIB when WITH_CARES=static |
Date: |
Fri, 20 Dec 2019 14:26:52 +0100 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to branch master
in repository gnurl.
commit 476a8320945243c80bdf3b161232511442d8dc49
Author: Andrew Ishchuk <address@hidden>
AuthorDate: Mon Dec 9 16:00:20 2019 +0500
winbuild: Define CARES_STATICLIB when WITH_CARES=static
When libcurl is built with MODE=static, c-ares is forced into static
linkage too. That doesn't happen when MODE=dll so linker would break
over undefined symbols.
closes https://github.com/curl/curl/pull/4688
---
winbuild/MakefileBuild.vc | 3 +++
1 file changed, 3 insertions(+)
diff --git a/winbuild/MakefileBuild.vc b/winbuild/MakefileBuild.vc
index 6f34257c5..4e39be66f 100644
--- a/winbuild/MakefileBuild.vc
+++ b/winbuild/MakefileBuild.vc
@@ -222,6 +222,9 @@ CARES = static
!IFDEF USE_CARES
CARES_CFLAGS = /DUSE_ARES /I"$(CARES_INC_DIR)"
+!IF "$(CARES)"=="static"
+CARES_CFLAGS = $(CARES_CFLAGS) /DCARES_STATICLIB
+!ENDIF
!ENDIF
--
To stop receiving notification emails like this one, please contact
address@hidden.
- [gnurl] 77/151: azure-pipelines: fix the test script, (continued)
- [gnurl] 77/151: azure-pipelines: fix the test script, gnunet, 2019/12/20
- [gnurl] 73/151: build: Disable Visual Studio warning "conditional expression is constant", gnunet, 2019/12/20
- [gnurl] 79/151: OPENSOCKETFUNCTION.3: correct the purpose description, gnunet, 2019/12/20
- [gnurl] 84/151: curl_setup: disable IPv6 resolver without `getaddrinfo`, gnunet, 2019/12/20
- [gnurl] 80/151: curl: show better error message when no homedir is found, gnunet, 2019/12/20
- [gnurl] 83/151: github action/azure pipeline: run 'make test-nonflaky' for tests, gnunet, 2019/12/20
- [gnurl] 82/151: openssl: CURLSSLOPT_NO_PARTIALCHAIN can disable partial cert chains, gnunet, 2019/12/20
- [gnurl] 85/151: configure: enable IPv6 support without `getaddrinfo`, gnunet, 2019/12/20
- [gnurl] 87/151: CURLOPT_VERBOSE.3: see also ERRORBUFFER, gnunet, 2019/12/20
- [gnurl] 98/151: curl: make the etag load logic work without fseek, gnunet, 2019/12/20
- [gnurl] 103/151: winbuild: Define CARES_STATICLIB when WITH_CARES=static,
gnunet <=
- [gnurl] 90/151: test342: make it return a 304 as the tag matches, gnunet, 2019/12/20
- [gnurl] 99/151: azure: add a vanilla macos build, gnunet, 2019/12/20
- [gnurl] 105/151: tests: fix permissions of ssh keys in WSL, gnunet, 2019/12/20
- [gnurl] 102/151: conn: always set bits.close with connclose(), gnunet, 2019/12/20
- [gnurl] 116/151: curl: improved cleanup in upload error path, gnunet, 2019/12/20
- [gnurl] 108/151: azure: add libssh2 and cmake macos builds, gnunet, 2019/12/20
- [gnurl] 107/151: curl: use errorf() better, gnunet, 2019/12/20
- [gnurl] 114/151: travis: make torture use --shallow=40, gnunet, 2019/12/20
- [gnurl] 119/151: altsvc: make the save function ignore NULL filenames, gnunet, 2019/12/20
- [gnurl] 118/151: curl: fix memory leak in OOM in etags logic, gnunet, 2019/12/20