Gitweb links:
...log
http://git.netsurf-browser.org/toolchains.git/shortlog/25518fa5d5416866e32b029f413305537932a2e6
...commit
http://git.netsurf-browser.org/toolchains.git/commit/25518fa5d5416866e32b029f413305537932a2e6
...tree
http://git.netsurf-browser.org/toolchains.git/tree/25518fa5d5416866e32b029f413305537932a2e6
The branch, chris/amissl has been updated
via 25518fa5d5416866e32b029f413305537932a2e6 (commit)
via b5ecf905f486b0aec2c00ad4974f51c1ae8c0c86 (commit)
from 8b2d1796fa42f0bf9cc5be64cd7c0592790e9f07 (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=25518fa5d5416866e32b029f413305537932a2e6
commit 25518fa5d5416866e32b029f413305537932a2e6
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Don't build OpenSSL for m68k-amigaos but let it believe it has been built
because Curl needs it.
Issues: Curl won't see AmiSSL as the includes alone are not enough to trick
it. Creating dummy libssl.a libcrypto.a nearly works but still chokes as the
test programs don't include anything so the AmiSSL inlines don't get opened.
Solution might be to build a dummy libssl.a which redirects the needed
functions.
There's an issue with amissl/inline.h with the latest includes (hack
#define it so it doesn't try - may cause other problems later but this is not
where the troublesome SSL_connect() is defined)
diff --git a/sdk/Makefile b/sdk/Makefile
index 70e37d0..2833b48 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -131,7 +131,7 @@ ifeq ($(TARGET),m68k-unknown-amigaos)
LIBICONV_ENV := CFLAGS="-DPATH_MAX=1024"
LIBJPEG_ENV := LDFLAGS="-lm"
LIBJPEG_TURBO_ENV := LDFLAGS="-lm"
- LIBCURL_ENV := LIBS="-lm"
+ LIBCURL_ENV := LIBS="-lm -lamisslauto"
endif
ifeq ($(SDK_ITEMS),)
@@ -336,8 +336,10 @@ $(SOURCEDIR)/pbl_$(VERSION_LIBPBL).tar.gz:
# OpenSSL
$(BUILDSTEPS)/openssl.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/zlib.d
$(BUILDSTEPS)/openssl-src.d
+ifneq ($(TARGET),m68k-unknown-amigaos)
cd $(BUILDDIR)/openssl/openssl-$(VERSION_OPENSSL) && $(env) ./Configure
--prefix=$(GCCSDK_INSTALL_ENV) $(TARGET) no-shared no-threads
$(EXTRAARGS_OPENSSL)
cd $(BUILDDIR)/openssl/openssl-$(VERSION_OPENSSL) && $(env) make install
+endif
touch $@
# prepare the openssl source tree
commitdiff
http://git.netsurf-browser.org/toolchains.git/commit/?id=b5ecf905f486b0aec2c00ad4974f51c1ae8c0c86
commit b5ecf905f486b0aec2c00ad4974f51c1ae8c0c86
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
fix silly
diff --git a/m68k-unknown-amigaos/Makefile b/m68k-unknown-amigaos/Makefile
index 316029a..6dd0d2a 100644
--- a/m68k-unknown-amigaos/Makefile
+++ b/m68k-unknown-amigaos/Makefile
@@ -36,9 +36,9 @@ 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 := 7.16
+UPSTREAM_AMISSL_VERSION := 4.3
UPSTREAM_AMISSL_TARBALL := AmiSSL-$(UPSTREAM_AMISSL_VERSION).lha
-UPSTREAM_AMISSL :=
https://github.com/jens-maus/amissl/releases/download/$(UPSTREAM_AMISSL_VERSION)/$(UPSTREAM_AMISSL_TARBALL)
+UPSTREAM_AMISSL_URI :=
https://github.com/jens-maus/amissl/releases/download/$(UPSTREAM_AMISSL_VERSION)/$(UPSTREAM_AMISSL_TARBALL)
UPSTREAM_GUIGFX_TARBALL := guigfxlib.lha
UPSTREAM_GUIGFX_URI :=
http://neoscientists.org/~bifat/binarydistillery/$(UPSTREAM_GUIGFX_TARBALL)
@@ -143,7 +143,7 @@ $(BUILDSTEPS)/ndk.d: $(SOURCESDIR)/$(UPSTREAM_NDK_TARBALL)
$(SOURCESDIR)/$(UPSTR
lha xw=$(BUILDDIR)/codesets $(SOURCESDIR)/$(UPSTREAM_CODESETS_TARBALL)
cp -r $(BUILDDIR)/codesets/codesets/Developer/include/*
$(PREFIX)/$(TARGET_NAME)/sys-include/
mkdir -p $(BUILDDIR)/AmiSSL
- lha xw=$(BUILDDIR)/AmiSSL $(SOURCESDIR)/$(UPSTREAM_CODESETS_TARBALL)
+ lha xw=$(BUILDDIR)/AmiSSL $(SOURCESDIR)/$(UPSTREAM_AMISSL_TARBALL)
cp -r $(BUILDDIR)/AmiSSL/AmiSSL/Developer/include/*
$(PREFIX)/$(TARGET_NAME)/sys-include/
cp -r $(BUILDDIR)/AmiSSL/AmiSSL/Developer/lib/AmigaOS3/*
$(PREFIX)/$(TARGET_NAME)/lib/
touch $@
-----------------------------------------------------------------------
Summary of changes:
m68k-unknown-amigaos/Makefile | 6 +++---
sdk/Makefile | 4 +++-
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/m68k-unknown-amigaos/Makefile b/m68k-unknown-amigaos/Makefile
index 316029a..6dd0d2a 100644
--- a/m68k-unknown-amigaos/Makefile
+++ b/m68k-unknown-amigaos/Makefile
@@ -36,9 +36,9 @@ 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 := 7.16
+UPSTREAM_AMISSL_VERSION := 4.3
UPSTREAM_AMISSL_TARBALL := AmiSSL-$(UPSTREAM_AMISSL_VERSION).lha
-UPSTREAM_AMISSL :=
https://github.com/jens-maus/amissl/releases/download/$(UPSTREAM_AMISSL_VERSION)/$(UPSTREAM_AMISSL_TARBALL)
+UPSTREAM_AMISSL_URI :=
https://github.com/jens-maus/amissl/releases/download/$(UPSTREAM_AMISSL_VERSION)/$(UPSTREAM_AMISSL_TARBALL)
UPSTREAM_GUIGFX_TARBALL := guigfxlib.lha
UPSTREAM_GUIGFX_URI :=
http://neoscientists.org/~bifat/binarydistillery/$(UPSTREAM_GUIGFX_TARBALL)
@@ -143,7 +143,7 @@ $(BUILDSTEPS)/ndk.d: $(SOURCESDIR)/$(UPSTREAM_NDK_TARBALL)
$(SOURCESDIR)/$(UPSTR
lha xw=$(BUILDDIR)/codesets $(SOURCESDIR)/$(UPSTREAM_CODESETS_TARBALL)
cp -r $(BUILDDIR)/codesets/codesets/Developer/include/*
$(PREFIX)/$(TARGET_NAME)/sys-include/
mkdir -p $(BUILDDIR)/AmiSSL
- lha xw=$(BUILDDIR)/AmiSSL $(SOURCESDIR)/$(UPSTREAM_CODESETS_TARBALL)
+ lha xw=$(BUILDDIR)/AmiSSL $(SOURCESDIR)/$(UPSTREAM_AMISSL_TARBALL)
cp -r $(BUILDDIR)/AmiSSL/AmiSSL/Developer/include/*
$(PREFIX)/$(TARGET_NAME)/sys-include/
cp -r $(BUILDDIR)/AmiSSL/AmiSSL/Developer/lib/AmigaOS3/*
$(PREFIX)/$(TARGET_NAME)/lib/
touch $@
diff --git a/sdk/Makefile b/sdk/Makefile
index 70e37d0..2833b48 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -131,7 +131,7 @@ ifeq ($(TARGET),m68k-unknown-amigaos)
LIBICONV_ENV := CFLAGS="-DPATH_MAX=1024"
LIBJPEG_ENV := LDFLAGS="-lm"
LIBJPEG_TURBO_ENV := LDFLAGS="-lm"
- LIBCURL_ENV := LIBS="-lm"
+ LIBCURL_ENV := LIBS="-lm -lamisslauto"
endif
ifeq ($(SDK_ITEMS),)
@@ -336,8 +336,10 @@ $(SOURCEDIR)/pbl_$(VERSION_LIBPBL).tar.gz:
# OpenSSL
$(BUILDSTEPS)/openssl.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/zlib.d
$(BUILDSTEPS)/openssl-src.d
+ifneq ($(TARGET),m68k-unknown-amigaos)
cd $(BUILDDIR)/openssl/openssl-$(VERSION_OPENSSL) && $(env) ./Configure
--prefix=$(GCCSDK_INSTALL_ENV) $(TARGET) no-shared no-threads
$(EXTRAARGS_OPENSSL)
cd $(BUILDDIR)/openssl/openssl-$(VERSION_OPENSSL) && $(env) make install
+endif
touch $@
# prepare the openssl source tree
--
Cross-compilation toolchains and environments
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
