Gitweb links:
...log
http://git.netsurf-browser.org/toolchains.git/shortlog/a11b1b82505e4afceb...
...commit
http://git.netsurf-browser.org/toolchains.git/commit/a11b1b82505e4afceb86...
...tree
http://git.netsurf-browser.org/toolchains.git/tree/a11b1b82505e4afceb86a3...
The branch, master has been updated
via a11b1b82505e4afceb86a3c8ec712fb1e76c31fd (commit)
from a44257681608df3397ff698985ee7a5ea3e1f7b3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/toolchains.git/commit/?id=a11b1b82505e4afc...
commit a11b1b82505e4afceb86a3c8ec712fb1e76c31fd
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
Cause cares to be built statically on mingw32
diff --git a/sdk/Makefile b/sdk/Makefile
index cdfc23b..aad3e7e 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -122,8 +122,9 @@ endif
ifeq ($(TARGET),i686-w64-mingw32)
SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, libiconv.d libgnurx.d $(COMMON_SDK_ITEMS))
+ EXTRAARGS_LIBCARES := --disable-shared
EXTRAARGS_LIBCURL := --enable-nonblocking --enable-ares --disable-ldap
--without-random
- LIBCURL_ENV := LIBS="-lgdi32"
+ LIBCURL_ENV := CFLAGS="-DCARES_STATICLIB" LIBS="-lgdi32"
endif
ifeq ($(TARGET),m68k-unknown-amigaos)
-----------------------------------------------------------------------
Summary of changes:
sdk/Makefile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/sdk/Makefile b/sdk/Makefile
index cdfc23b..aad3e7e 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -122,8 +122,9 @@ endif
ifeq ($(TARGET),i686-w64-mingw32)
SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, libiconv.d libgnurx.d $(COMMON_SDK_ITEMS))
+ EXTRAARGS_LIBCARES := --disable-shared
EXTRAARGS_LIBCURL := --enable-nonblocking --enable-ares --disable-ldap
--without-random
- LIBCURL_ENV := LIBS="-lgdi32"
+ LIBCURL_ENV := CFLAGS="-DCARES_STATICLIB" LIBS="-lgdi32"
endif
ifeq ($(TARGET),m68k-unknown-amigaos)
--
Cross-compilation toolchains and environments