Gitweb links:
...log
http://git.netsurf-browser.org/toolchains.git/shortlog/cd1fadeb78b0b0ef39b95b0f8c2e8fb8e533512b
...commit
http://git.netsurf-browser.org/toolchains.git/commit/cd1fadeb78b0b0ef39b95b0f8c2e8fb8e533512b
...tree
http://git.netsurf-browser.org/toolchains.git/tree/cd1fadeb78b0b0ef39b95b0f8c2e8fb8e533512b
The branch, master has been updated
via cd1fadeb78b0b0ef39b95b0f8c2e8fb8e533512b (commit)
via 012d2a970fb610d89a753b5369fe5ba1ddbd2a01 (commit)
from 055069f60b6ac656faa635a07367f17448d2487d (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=cd1fadeb78b0b0ef39b95b0f8c2e8fb8e533512b
commit cd1fadeb78b0b0ef39b95b0f8c2e8fb8e533512b
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
m68k-unknown-amigaos: Switch libcurl to AmiSSL v5
libcurl+OpenSSL+NetSurf doesn't connect to secure sites under OS3.x.
Confirmed libcurl+AmiSSL (v5.13)+NetSurf, along with Miami,
is a working combination under AmigaOS 3.2.2.1
diff --git a/sdk/Makefile b/sdk/Makefile
index e1083ed..6cb1aa5 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -214,18 +214,16 @@ ifeq ($(TARGET),m68k-unknown-amigaos)
SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, roadshow.d libiconv.d libtre.d
libpbl.d $(COMMON_SDK_ITEMS) libjpeg.d)
EXTRAARGS_LIBCARES := --disable-shared --without-random
LIBCARES_ENV := LIBS="-lm"
- # XXX: reinstate amissl when there's v5 sdk?
- #LIBCURL_SSL := amissl
+ LIBCURL_SSL := amissl
EXTRAARGS_LIBCURL := --disable-ntlm-wb --without-random
--disable-threaded-resolver --with-zlib --disable-rt --disable-ipv6
LIBICONV_ENV := CFLAGS="-DPATH_MAX=1024 -DRLIMIT_NOFILE=6"
LIBJPEG_ENV := LDFLAGS="-lm"
LIBJPEG_TURBO_ENV := LDFLAGS="-lm"
- # XXX: build openssl against bsdsocket.library?
- #ENV_OPENSSL := CFLAGS="-I$(GCCSDK_INSTALL_ENV)/netinclude"
CPPFLAGS="-D__NO_NET_API"
+ ENV_OPENSSL := CFLAGS="-I$(GCCSDK_INSTALL_ENV)/netinclude"
CPPFLAGS="-D__NO_NET_API"
ifeq ($(LIBCURL_SSL),openssl)
LIBCURL_ENV := LIBS="-lm -lnet"
else
- LIBCURL_ENV := CFLAGS="-I$(GCCSDK_INSTALL_ENV)/netinclude -D__NO_NET_API"
LIBS="-lm"
+ LIBCURL_ENV := CFLAGS="-I$(GCCSDK_INSTALL_ENV)/netinclude -D__NO_NET_API
-DHAVE_IOCTLSOCKET_CAMEL_FIONBIO" LIBS="-lm"
endif
# XXX: libgcc is meant to be implied, but for some reason that
# results in ld evaluating it after libm and thus failing to find symbols.
commitdiff
http://git.netsurf-browser.org/toolchains.git/commit/?id=012d2a970fb610d89a753b5369fe5ba1ddbd2a01
commit 012d2a970fb610d89a753b5369fe5ba1ddbd2a01
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
m68k-unknown-amigaos: Update AmiSSL to v5.13
diff --git a/m68k-unknown-amigaos/Makefile b/m68k-unknown-amigaos/Makefile
index 5c66cdd..d3b3d52 100644
--- a/m68k-unknown-amigaos/Makefile
+++ b/m68k-unknown-amigaos/Makefile
@@ -36,8 +36,8 @@ UPSTREAM_OPENURL_VERSION := 7.16
UPSTREAM_OPENURL_TARBALL := openurl-$(UPSTREAM_OPENURL_VERSION)
UPSTREAM_OPENURL_URI :=
https://github.com/jens-maus/libopenurl/archive/$(UPSTREAM_OPENURL_VERSION).tar.gz
-UPSTREAM_AMISSL_VERSION := 4.4
-UPSTREAM_AMISSL_TARBALL := AmiSSL-$(UPSTREAM_AMISSL_VERSION).lha
+UPSTREAM_AMISSL_VERSION := 5.13
+UPSTREAM_AMISSL_TARBALL := AmiSSL-$(UPSTREAM_AMISSL_VERSION)-SDK.lha
UPSTREAM_AMISSL_URI :=
https://github.com/jens-maus/amissl/releases/download/$(UPSTREAM_AMISSL_VERSION)/$(UPSTREAM_AMISSL_TARBALL)
UPSTREAM_GUIGFX_TARBALL := guigfxlib.lha
-----------------------------------------------------------------------
Summary of changes:
m68k-unknown-amigaos/Makefile | 4 ++--
sdk/Makefile | 8 +++-----
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/m68k-unknown-amigaos/Makefile b/m68k-unknown-amigaos/Makefile
index 5c66cdd..d3b3d52 100644
--- a/m68k-unknown-amigaos/Makefile
+++ b/m68k-unknown-amigaos/Makefile
@@ -36,8 +36,8 @@ UPSTREAM_OPENURL_VERSION := 7.16
UPSTREAM_OPENURL_TARBALL := openurl-$(UPSTREAM_OPENURL_VERSION)
UPSTREAM_OPENURL_URI :=
https://github.com/jens-maus/libopenurl/archive/$(UPSTREAM_OPENURL_VERSION).tar.gz
-UPSTREAM_AMISSL_VERSION := 4.4
-UPSTREAM_AMISSL_TARBALL := AmiSSL-$(UPSTREAM_AMISSL_VERSION).lha
+UPSTREAM_AMISSL_VERSION := 5.13
+UPSTREAM_AMISSL_TARBALL := AmiSSL-$(UPSTREAM_AMISSL_VERSION)-SDK.lha
UPSTREAM_AMISSL_URI :=
https://github.com/jens-maus/amissl/releases/download/$(UPSTREAM_AMISSL_VERSION)/$(UPSTREAM_AMISSL_TARBALL)
UPSTREAM_GUIGFX_TARBALL := guigfxlib.lha
diff --git a/sdk/Makefile b/sdk/Makefile
index e1083ed..6cb1aa5 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -214,18 +214,16 @@ ifeq ($(TARGET),m68k-unknown-amigaos)
SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, roadshow.d libiconv.d libtre.d
libpbl.d $(COMMON_SDK_ITEMS) libjpeg.d)
EXTRAARGS_LIBCARES := --disable-shared --without-random
LIBCARES_ENV := LIBS="-lm"
- # XXX: reinstate amissl when there's v5 sdk?
- #LIBCURL_SSL := amissl
+ LIBCURL_SSL := amissl
EXTRAARGS_LIBCURL := --disable-ntlm-wb --without-random
--disable-threaded-resolver --with-zlib --disable-rt --disable-ipv6
LIBICONV_ENV := CFLAGS="-DPATH_MAX=1024 -DRLIMIT_NOFILE=6"
LIBJPEG_ENV := LDFLAGS="-lm"
LIBJPEG_TURBO_ENV := LDFLAGS="-lm"
- # XXX: build openssl against bsdsocket.library?
- #ENV_OPENSSL := CFLAGS="-I$(GCCSDK_INSTALL_ENV)/netinclude"
CPPFLAGS="-D__NO_NET_API"
+ ENV_OPENSSL := CFLAGS="-I$(GCCSDK_INSTALL_ENV)/netinclude"
CPPFLAGS="-D__NO_NET_API"
ifeq ($(LIBCURL_SSL),openssl)
LIBCURL_ENV := LIBS="-lm -lnet"
else
- LIBCURL_ENV := CFLAGS="-I$(GCCSDK_INSTALL_ENV)/netinclude -D__NO_NET_API"
LIBS="-lm"
+ LIBCURL_ENV := CFLAGS="-I$(GCCSDK_INSTALL_ENV)/netinclude -D__NO_NET_API
-DHAVE_IOCTLSOCKET_CAMEL_FIONBIO" LIBS="-lm"
endif
# XXX: libgcc is meant to be implied, but for some reason that
# results in ld evaluating it after libm and thus failing to find symbols.
--
Cross-compilation toolchains and environments
_______________________________________________
netsurf-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
