Gitweb links: ...log http://git.netsurf-browser.org/toolchains.git/shortlog/c7a9662f9f362809fe... ...commit http://git.netsurf-browser.org/toolchains.git/commit/c7a9662f9f362809fee5... ...tree http://git.netsurf-browser.org/toolchains.git/tree/c7a9662f9f362809fee572... The branch, chris/amissl has been updated via c7a9662f9f362809fee572665c4ec8f00f3dbd93 (commit) via 2b2fc4177cdc4feef6c46cbd0e710b49ccfc4791 (commit) via 5aa16e27177fbaffb9955abe48bd2917d0253828 (commit) from 89e31170574c954cfabec1634df5d1918d5fa59f (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=c7a9662f9f362809... commit c7a9662f9f362809fee572665c4ec8f00f3dbd93 Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Add netinclude dir to Curl's CFLAGS diff --git a/sdk/Makefile b/sdk/Makefile index 8c8c93d..d176e63 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 := CFLAGS="-D__NO_NET_API" LIBS="-lm" + LIBCURL_ENV := CFLAGS="-I$(GCCSDK_INSTALL_ENV)/netinclude -D__NO_NET_API" LIBS="-lm" endif ifeq ($(SDK_ITEMS),) @@ -306,6 +306,7 @@ $(SOURCEDIR)/freetype-$(VERSION_FREETYPE).tar.bz2: $(BUILDSTEPS)/roadshow.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/roadshow-src.d mkdir -p $(BUILDDIR)/Roadshow-SDK lha xw=$(BUILDDIR)/Roadshow-SDK $(SOURCEDIR)/Roadshow-SDK-NS.lha + mkdir -p $(GCCSDK_INSTALL_ENV)/netinclude cp -r $(BUILDDIR)/Roadshow-SDK/SDK/netinclude/* $(GCCSDK_INSTALL_ENV)/netinclude/ touch $@ commitdiff http://git.netsurf-browser.org/toolchains.git/commit/?id=2b2fc4177cdc4fee... commit 2b2fc4177cdc4feef6c46cbd0e710b49ccfc4791 Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Move Roadshow SDK into the SDK part of the toolchain where the include path can be determined more easily diff --git a/m68k-unknown-amigaos/Makefile b/m68k-unknown-amigaos/Makefile index d26af6b..6dd0d2a 100644 --- a/m68k-unknown-amigaos/Makefile +++ b/m68k-unknown-amigaos/Makefile @@ -32,9 +32,6 @@ UPSTREAM_CLIB2_URI := https://github.com/adtools/clib2/archive/$(UPSTREAM_CLIB2_ UPSTREAM_NDK_TARBALL := ndk-3.9-includes.tar.bz2 UPSTREAM_NDK_URI := http://kas1e.mikendezign.com/zerohero_crosscompilers_backup/files/m68k-am... -UPSTREAM_ROADSHOWSDK_TARBALL := Roadshow-SDK-NS.lha -UPSTREAM_ROADSHOWSDK_URI := https://github.com/chris-y/curl/releases/download/curl-7_64_0-amissl/$(UP... - UPSTREAM_OPENURL_VERSION := 7.16 UPSTREAM_OPENURL_TARBALL := openurl-$(UPSTREAM_OPENURL_VERSION) UPSTREAM_OPENURL_URI := https://github.com/jens-maus/libopenurl/archive/$(UPSTREAM_OPENURL_VERSIO... @@ -127,7 +124,7 @@ $(BUILDSTEPS)/clib2-src.d: $(SOURCESDIR)/$(UPSTREAM_CLIB2_TARBALL) # Rules to install the NDK ### -$(BUILDSTEPS)/ndk.d: $(SOURCESDIR)/$(UPSTREAM_NDK_TARBALL) $(SOURCESDIR)/$(UPSTREAM_OPENURL_TARBALL) $(SOURCESDIR)/$(UPSTREAM_GUIGFX_TARBALL) $(SOURCESDIR)/$(UPSTREAM_RENDER_TARBALL) $(SOURCESDIR)/$(UPSTREAM_CODESETS_TARBALL) $(SOURCESDIR)/$(UPSTREAM_AMISSL_TARBALL) $(SOURCESDIR)/$(UPSTREAM_ROADSHOWSDK_TARBALL) +$(BUILDSTEPS)/ndk.d: $(SOURCESDIR)/$(UPSTREAM_NDK_TARBALL) $(SOURCESDIR)/$(UPSTREAM_OPENURL_TARBALL) $(SOURCESDIR)/$(UPSTREAM_GUIGFX_TARBALL) $(SOURCESDIR)/$(UPSTREAM_RENDER_TARBALL) $(SOURCESDIR)/$(UPSTREAM_CODESETS_TARBALL) $(SOURCESDIR)/$(UPSTREAM_AMISSL_TARBALL) mkdir -p $(PREFIX)/$(TARGET_NAME) tar -C $(PREFIX)/$(TARGET_NAME) --strip-components=2 -xjf $(SOURCESDIR)/$(UPSTREAM_NDK_TARBALL) for p in `ls $(RECIPES)/patches/ndk/*.p` ; do patch -d $(PREFIX)/$(TARGET_NAME) -p0 <$$p ; done @@ -149,9 +146,6 @@ $(BUILDSTEPS)/ndk.d: $(SOURCESDIR)/$(UPSTREAM_NDK_TARBALL) $(SOURCESDIR)/$(UPSTR 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/ - mkdir -p $(BUILDDIR)/Roadshow-SDK - lha xw=$(BUILDDIR)/Roadshow-SDK $(SOURCESDIR)/$(UPSTREAM_ROADSHOWSDK_TARBALL) - cp -r $(BUILDDIR)/Roadshow-SDK/SDK/netinclude/* $(PREFIX)/$(TARGET_NAME)/netinclude/ touch $@ ### @@ -262,9 +256,6 @@ $(SOURCESDIR)/$(UPSTREAM_CLIB2_TARBALL): $(SOURCESDIR)/$(UPSTREAM_NDK_TARBALL): wget -q -O $@ $(UPSTREAM_NDK_URI) -$(SOURCESDIR)/$(UPSTREAM_ROADSHOWSDK_TARBALL): - wget -q -O $@ $(UPSTREAM_ROADSHOWSDK_URI) - $(SOURCESDIR)/$(UPSTREAM_OPENURL_TARBALL): wget -q -O $@ $(UPSTREAM_OPENURL_URI) diff --git a/sdk/Makefile b/sdk/Makefile index 82940b7..8c8c93d 100644 --- a/sdk/Makefile +++ b/sdk/Makefile @@ -125,7 +125,7 @@ ifeq ($(TARGET),i686-w64-mingw32) endif ifeq ($(TARGET),m68k-unknown-amigaos) - SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, libiconv.d libtre.d libpbl.d $(COMMON_SDK_ITEMS) libjpeg.d) + SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, roadshow.d 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-amissl --with-zlib --disable-rt LIBICONV_ENV := CFLAGS="-DPATH_MAX=1024" @@ -302,6 +302,19 @@ $(BUILDSTEPS)/freetype-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/freetype-$( $(SOURCEDIR)/freetype-$(VERSION_FREETYPE).tar.bz2: $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "http://download.savannah.gnu.org/releases/freetype/freetype-$(VERSION_FREETYPE).tar.bz2" $@ +# amiga roadshow sdk +$(BUILDSTEPS)/roadshow.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/roadshow-src.d + mkdir -p $(BUILDDIR)/Roadshow-SDK + lha xw=$(BUILDDIR)/Roadshow-SDK $(SOURCEDIR)/Roadshow-SDK-NS.lha + cp -r $(BUILDDIR)/Roadshow-SDK/SDK/netinclude/* $(GCCSDK_INSTALL_ENV)/netinclude/ + touch $@ + +$(BUILDSTEPS)/roadshow-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/Roadshow-SDK-NS.lha + touch $@ + +$(SOURCEDIR)/Roadshow-SDK-NS.lha: + $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "https://github.com/chris-y/curl/releases/download/curl-7_64_0-amissl/Roadshow-SDK-NS.lha" $@ + # regex $(BUILDSTEPS)/libtre.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/libtre-src.d mkdir -p $(BUILDDIR)/libtre commitdiff http://git.netsurf-browser.org/toolchains.git/commit/?id=5aa16e27177fbaff... commit 5aa16e27177fbaffb9955abe48bd2917d0253828 Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Install the Roadshow SDK into netinclude This is a modified copy of the SDK, partly because the official download is buried behind a form and can't be downloaded directly: netinclude/inline/* are the corrected ones netinclude/errno.h has been removed source_code has been removed diff --git a/m68k-unknown-amigaos/Makefile b/m68k-unknown-amigaos/Makefile index 6dd0d2a..d26af6b 100644 --- a/m68k-unknown-amigaos/Makefile +++ b/m68k-unknown-amigaos/Makefile @@ -32,6 +32,9 @@ UPSTREAM_CLIB2_URI := https://github.com/adtools/clib2/archive/$(UPSTREAM_CLIB2_ UPSTREAM_NDK_TARBALL := ndk-3.9-includes.tar.bz2 UPSTREAM_NDK_URI := http://kas1e.mikendezign.com/zerohero_crosscompilers_backup/files/m68k-am... +UPSTREAM_ROADSHOWSDK_TARBALL := Roadshow-SDK-NS.lha +UPSTREAM_ROADSHOWSDK_URI := https://github.com/chris-y/curl/releases/download/curl-7_64_0-amissl/$(UP... + UPSTREAM_OPENURL_VERSION := 7.16 UPSTREAM_OPENURL_TARBALL := openurl-$(UPSTREAM_OPENURL_VERSION) UPSTREAM_OPENURL_URI := https://github.com/jens-maus/libopenurl/archive/$(UPSTREAM_OPENURL_VERSIO... @@ -124,7 +127,7 @@ $(BUILDSTEPS)/clib2-src.d: $(SOURCESDIR)/$(UPSTREAM_CLIB2_TARBALL) # Rules to install the NDK ### -$(BUILDSTEPS)/ndk.d: $(SOURCESDIR)/$(UPSTREAM_NDK_TARBALL) $(SOURCESDIR)/$(UPSTREAM_OPENURL_TARBALL) $(SOURCESDIR)/$(UPSTREAM_GUIGFX_TARBALL) $(SOURCESDIR)/$(UPSTREAM_RENDER_TARBALL) $(SOURCESDIR)/$(UPSTREAM_CODESETS_TARBALL) $(SOURCESDIR)/$(UPSTREAM_AMISSL_TARBALL) +$(BUILDSTEPS)/ndk.d: $(SOURCESDIR)/$(UPSTREAM_NDK_TARBALL) $(SOURCESDIR)/$(UPSTREAM_OPENURL_TARBALL) $(SOURCESDIR)/$(UPSTREAM_GUIGFX_TARBALL) $(SOURCESDIR)/$(UPSTREAM_RENDER_TARBALL) $(SOURCESDIR)/$(UPSTREAM_CODESETS_TARBALL) $(SOURCESDIR)/$(UPSTREAM_AMISSL_TARBALL) $(SOURCESDIR)/$(UPSTREAM_ROADSHOWSDK_TARBALL) mkdir -p $(PREFIX)/$(TARGET_NAME) tar -C $(PREFIX)/$(TARGET_NAME) --strip-components=2 -xjf $(SOURCESDIR)/$(UPSTREAM_NDK_TARBALL) for p in `ls $(RECIPES)/patches/ndk/*.p` ; do patch -d $(PREFIX)/$(TARGET_NAME) -p0 <$$p ; done @@ -146,6 +149,9 @@ $(BUILDSTEPS)/ndk.d: $(SOURCESDIR)/$(UPSTREAM_NDK_TARBALL) $(SOURCESDIR)/$(UPSTR 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/ + mkdir -p $(BUILDDIR)/Roadshow-SDK + lha xw=$(BUILDDIR)/Roadshow-SDK $(SOURCESDIR)/$(UPSTREAM_ROADSHOWSDK_TARBALL) + cp -r $(BUILDDIR)/Roadshow-SDK/SDK/netinclude/* $(PREFIX)/$(TARGET_NAME)/netinclude/ touch $@ ### @@ -256,6 +262,9 @@ $(SOURCESDIR)/$(UPSTREAM_CLIB2_TARBALL): $(SOURCESDIR)/$(UPSTREAM_NDK_TARBALL): wget -q -O $@ $(UPSTREAM_NDK_URI) +$(SOURCESDIR)/$(UPSTREAM_ROADSHOWSDK_TARBALL): + wget -q -O $@ $(UPSTREAM_ROADSHOWSDK_URI) + $(SOURCESDIR)/$(UPSTREAM_OPENURL_TARBALL): wget -q -O $@ $(UPSTREAM_OPENURL_URI) ----------------------------------------------------------------------- Summary of changes: sdk/Makefile | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/sdk/Makefile b/sdk/Makefile index 82940b7..d176e63 100644 --- a/sdk/Makefile +++ b/sdk/Makefile @@ -125,13 +125,13 @@ ifeq ($(TARGET),i686-w64-mingw32) endif ifeq ($(TARGET),m68k-unknown-amigaos) - SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, libiconv.d libtre.d libpbl.d $(COMMON_SDK_ITEMS) libjpeg.d) + SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, roadshow.d 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-amissl --with-zlib --disable-rt LIBICONV_ENV := CFLAGS="-DPATH_MAX=1024" LIBJPEG_ENV := LDFLAGS="-lm" LIBJPEG_TURBO_ENV := LDFLAGS="-lm" - LIBCURL_ENV := CFLAGS="-D__NO_NET_API" LIBS="-lm" + LIBCURL_ENV := CFLAGS="-I$(GCCSDK_INSTALL_ENV)/netinclude -D__NO_NET_API" LIBS="-lm" endif ifeq ($(SDK_ITEMS),) @@ -302,6 +302,20 @@ $(BUILDSTEPS)/freetype-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/freetype-$( $(SOURCEDIR)/freetype-$(VERSION_FREETYPE).tar.bz2: $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "http://download.savannah.gnu.org/releases/freetype/freetype-$(VERSION_FREETYPE).tar.bz2" $@ +# amiga roadshow sdk +$(BUILDSTEPS)/roadshow.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/roadshow-src.d + mkdir -p $(BUILDDIR)/Roadshow-SDK + lha xw=$(BUILDDIR)/Roadshow-SDK $(SOURCEDIR)/Roadshow-SDK-NS.lha + mkdir -p $(GCCSDK_INSTALL_ENV)/netinclude + cp -r $(BUILDDIR)/Roadshow-SDK/SDK/netinclude/* $(GCCSDK_INSTALL_ENV)/netinclude/ + touch $@ + +$(BUILDSTEPS)/roadshow-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/Roadshow-SDK-NS.lha + touch $@ + +$(SOURCEDIR)/Roadshow-SDK-NS.lha: + $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "https://github.com/chris-y/curl/releases/download/curl-7_64_0-amissl/Roadshow-SDK-NS.lha" $@ + # regex $(BUILDSTEPS)/libtre.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/libtre-src.d mkdir -p $(BUILDDIR)/libtre -- Cross-compilation toolchains and environments