Gitweb links:
...log
http://git.netsurf-browser.org/toolchains.git/shortlog/91c06d486d6bfccb98294fa51b4fd1118a74a68f
...commit
http://git.netsurf-browser.org/toolchains.git/commit/91c06d486d6bfccb98294fa51b4fd1118a74a68f
...tree
http://git.netsurf-browser.org/toolchains.git/tree/91c06d486d6bfccb98294fa51b4fd1118a74a68f
The branch, chris/amissl has been updated
via 91c06d486d6bfccb98294fa51b4fd1118a74a68f (commit)
from 9c3490f1c07e0a0c8ddea652cc4fe93af355106a (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=91c06d486d6bfccb98294fa51b4fd1118a74a68f
commit 91c06d486d6bfccb98294fa51b4fd1118a74a68f
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Build libcurl against AmiSSL for m68k-unknown-amigaos target
diff --git a/m68k-unknown-amigaos/Makefile b/m68k-unknown-amigaos/Makefile
index 6dd0d2a..49766cf 100644
--- a/m68k-unknown-amigaos/Makefile
+++ b/m68k-unknown-amigaos/Makefile
@@ -144,8 +144,8 @@ $(BUILDSTEPS)/ndk.d: $(SOURCESDIR)/$(UPSTREAM_NDK_TARBALL)
$(SOURCESDIR)/$(UPSTR
cp -r $(BUILDDIR)/codesets/codesets/Developer/include/*
$(PREFIX)/$(TARGET_NAME)/sys-include/
mkdir -p $(BUILDDIR)/AmiSSL
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/
+ cp -r $(BUILDDIR)/AmiSSL/AmiSSL/Developer/include/*
$(PREFIX)/../env/include/
+ cp -r $(BUILDDIR)/AmiSSL/AmiSSL/Developer/lib/AmigaOS3/*
$(PREFIX)/../env/lib/
touch $@
###
diff --git a/sdk/Makefile b/sdk/Makefile
index 2833b48..1d20fcf 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -127,11 +127,11 @@ endif
ifeq ($(TARGET),m68k-unknown-amigaos)
SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, libiconv.d libtre.d libpbl.d
$(COMMON_SDK_ITEMS) libjpeg.d)
EXTRAARGS_LIBCARES := --disable-shared --without-random
- EXTRAARGS_LIBCURL := --disable-ntlm-wb --without-random
--disable-threaded-resolver --with-ssl --with-zlib
+ EXTRAARGS_LIBCURL := --disable-ntlm-wb --without-random
--disable-threaded-resolver --with-amissl --with-zlib --disable-rt
LIBICONV_ENV := CFLAGS="-DPATH_MAX=1024"
LIBJPEG_ENV := LDFLAGS="-lm"
LIBJPEG_TURBO_ENV := LDFLAGS="-lm"
- LIBCURL_ENV := LIBS="-lm -lamisslauto"
+ LIBCURL_ENV := LIBS="-lm"
endif
ifeq ($(SDK_ITEMS),)
-----------------------------------------------------------------------
Summary of changes:
m68k-unknown-amigaos/Makefile | 4 ++--
sdk/Makefile | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/m68k-unknown-amigaos/Makefile b/m68k-unknown-amigaos/Makefile
index 6dd0d2a..49766cf 100644
--- a/m68k-unknown-amigaos/Makefile
+++ b/m68k-unknown-amigaos/Makefile
@@ -144,8 +144,8 @@ $(BUILDSTEPS)/ndk.d: $(SOURCESDIR)/$(UPSTREAM_NDK_TARBALL)
$(SOURCESDIR)/$(UPSTR
cp -r $(BUILDDIR)/codesets/codesets/Developer/include/*
$(PREFIX)/$(TARGET_NAME)/sys-include/
mkdir -p $(BUILDDIR)/AmiSSL
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/
+ cp -r $(BUILDDIR)/AmiSSL/AmiSSL/Developer/include/*
$(PREFIX)/../env/include/
+ cp -r $(BUILDDIR)/AmiSSL/AmiSSL/Developer/lib/AmigaOS3/*
$(PREFIX)/../env/lib/
touch $@
###
diff --git a/sdk/Makefile b/sdk/Makefile
index 2833b48..1d20fcf 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -127,11 +127,11 @@ endif
ifeq ($(TARGET),m68k-unknown-amigaos)
SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, libiconv.d libtre.d libpbl.d
$(COMMON_SDK_ITEMS) libjpeg.d)
EXTRAARGS_LIBCARES := --disable-shared --without-random
- EXTRAARGS_LIBCURL := --disable-ntlm-wb --without-random
--disable-threaded-resolver --with-ssl --with-zlib
+ EXTRAARGS_LIBCURL := --disable-ntlm-wb --without-random
--disable-threaded-resolver --with-amissl --with-zlib --disable-rt
LIBICONV_ENV := CFLAGS="-DPATH_MAX=1024"
LIBJPEG_ENV := LDFLAGS="-lm"
LIBJPEG_TURBO_ENV := LDFLAGS="-lm"
- LIBCURL_ENV := LIBS="-lm -lamisslauto"
+ LIBCURL_ENV := LIBS="-lm"
endif
ifeq ($(SDK_ITEMS),)
--
Cross-compilation toolchains and environments
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
