Gitweb links:
...log
http://git.netsurf-browser.org/toolchains.git/shortlog/e53bdb13246bc68a03a2312eccc42bf19be8dd3d
...commit
http://git.netsurf-browser.org/toolchains.git/commit/e53bdb13246bc68a03a2312eccc42bf19be8dd3d
...tree
http://git.netsurf-browser.org/toolchains.git/tree/e53bdb13246bc68a03a2312eccc42bf19be8dd3d
The branch, master has been updated
via e53bdb13246bc68a03a2312eccc42bf19be8dd3d (commit)
from 78871a0b9d36f79e00ddf84f73dadeff3f2687da (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=e53bdb13246bc68a03a2312eccc42bf19be8dd3d
commit e53bdb13246bc68a03a2312eccc42bf19be8dd3d
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
allow libcurl to build with static cares
diff --git a/sdk/Makefile b/sdk/Makefile
index ea4fc74..dd1c9dd 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -171,7 +171,7 @@ ifeq ($(TARGET),i686-w64-mingw32)
SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, libiconv.d libgnurx.d
$(COMMON_SDK_ITEMS) libjpeg.d libwebp.d)
EXTRAARGS_LIBCARES := --disable-shared
EXTRAARGS_LIBCURL := --enable-nonblocking --enable-ares --disable-ldap
--without-random
- LIBCURL_ENV := CFLAGS="-DCARES_STATICLIB" LIBS="-lgdi32 -lcrypt32"
+ LIBCURL_ENV := CFLAGS="-DCARES_STATICLIB" LIBS="-lgdi32 -lcrypt32 -liphlpapi"
TARGET_OPENSSL := mingw
ENV_OPENSSL := WINDRES="$(windres__)"
EXTRAARGS_OPENSSL := no-asm enable-capieng
@@ -181,7 +181,7 @@ ifeq ($(TARGET),x86_64-w64-mingw32)
SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, libiconv.d libgnurx.d
$(COMMON_SDK_ITEMS) libjpeg.d libwebp.d)
EXTRAARGS_LIBCARES := --disable-shared
EXTRAARGS_LIBCURL := --enable-nonblocking --enable-ares --disable-ldap
--without-random
- LIBCURL_ENV := CFLAGS="-DCARES_STATICLIB" LIBS="-lgdi32 -lcrypt32"
+ LIBCURL_ENV := CFLAGS="-DCARES_STATICLIB" LIBS="-lgdi32 -lcrypt32 -liphlpapi"
TARGET_OPENSSL := mingw64
EXTRAARGS_OPENSSL := no-asm enable-capieng
endif
-----------------------------------------------------------------------
Summary of changes:
sdk/Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sdk/Makefile b/sdk/Makefile
index ea4fc74..dd1c9dd 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -171,7 +171,7 @@ ifeq ($(TARGET),i686-w64-mingw32)
SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, libiconv.d libgnurx.d
$(COMMON_SDK_ITEMS) libjpeg.d libwebp.d)
EXTRAARGS_LIBCARES := --disable-shared
EXTRAARGS_LIBCURL := --enable-nonblocking --enable-ares --disable-ldap
--without-random
- LIBCURL_ENV := CFLAGS="-DCARES_STATICLIB" LIBS="-lgdi32 -lcrypt32"
+ LIBCURL_ENV := CFLAGS="-DCARES_STATICLIB" LIBS="-lgdi32 -lcrypt32 -liphlpapi"
TARGET_OPENSSL := mingw
ENV_OPENSSL := WINDRES="$(windres__)"
EXTRAARGS_OPENSSL := no-asm enable-capieng
@@ -181,7 +181,7 @@ ifeq ($(TARGET),x86_64-w64-mingw32)
SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, libiconv.d libgnurx.d
$(COMMON_SDK_ITEMS) libjpeg.d libwebp.d)
EXTRAARGS_LIBCARES := --disable-shared
EXTRAARGS_LIBCURL := --enable-nonblocking --enable-ares --disable-ldap
--without-random
- LIBCURL_ENV := CFLAGS="-DCARES_STATICLIB" LIBS="-lgdi32 -lcrypt32"
+ LIBCURL_ENV := CFLAGS="-DCARES_STATICLIB" LIBS="-lgdi32 -lcrypt32 -liphlpapi"
TARGET_OPENSSL := mingw64
EXTRAARGS_OPENSSL := no-asm enable-capieng
endif
--
Cross-compilation toolchains and environments
_______________________________________________
netsurf-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
