diff options
| author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2021-06-08 20:04:15 +0100 |
|---|---|---|
| committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2021-06-08 20:04:15 +0100 |
| commit | f7429c43ddb4e35cdbf83999b9ed78e366fc1a6f (patch) | |
| tree | c57be0b6f179bf5a20b36dcb147b87bbfac01f6c | |
| parent | 6a68f6cf2628d82a5d31f668051d0bb9062ac4ae (diff) | |
| download | toolchains-f7429c43ddb4e35cdbf83999b9ed78e366fc1a6f.tar.gz toolchains-f7429c43ddb4e35cdbf83999b9ed78e366fc1a6f.tar.bz2 | |
Update to NDK3.2R2
This is newer than NDK3.9!
It doesn't work currently as it appears the GCC inlines are missing and/or need generating
| -rw-r--r-- | m68k-unknown-amigaos/Makefile | 15 | ||||
| -rw-r--r-- | m68k-unknown-amigaos/recipes/patches/clib2/amiga_invertstring.c.p | 11 | ||||
| -rw-r--r-- | sdk/Makefile | 2 |
3 files changed, 19 insertions, 9 deletions
diff --git a/m68k-unknown-amigaos/Makefile b/m68k-unknown-amigaos/Makefile index 5c66cdd..8c6f849 100644 --- a/m68k-unknown-amigaos/Makefile +++ b/m68k-unknown-amigaos/Makefile @@ -29,14 +29,14 @@ UPSTREAM_CLIB2_VERSION := 1_214 UPSTREAM_CLIB2_TARBALL := V$(UPSTREAM_CLIB2_VERSION).tar.gz UPSTREAM_CLIB2_URI := https://github.com/adtools/clib2/archive/$(UPSTREAM_CLIB2_TARBALL) -UPSTREAM_NDK_TARBALL := ndk-3.9-includes.tar.bz2 -UPSTREAM_NDK_URI := http://kas1e.mikendezign.com/zerohero_crosscompilers_backup/files/m68k-amigaos/ndk-3.9-includes.tar.bz2 +UPSTREAM_NDK_TARBALL := NDK3.2R2.lha +UPSTREAM_NDK_URI := "http://hyperion-entertainment.biz/index.php/downloads?view=download&format=raw&file=122" 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_VERSION := 4.9 UPSTREAM_AMISSL_TARBALL := AmiSSL-$(UPSTREAM_AMISSL_VERSION).lha UPSTREAM_AMISSL_URI := https://github.com/jens-maus/amissl/releases/download/$(UPSTREAM_AMISSL_VERSION)/$(UPSTREAM_AMISSL_TARBALL) @@ -125,11 +125,10 @@ $(BUILDSTEPS)/clib2-src.d: $(SOURCESDIR)/$(UPSTREAM_CLIB2_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 - for dir in `find $(RECIPES)/files/ndk/ -type d | grep -v '\.svn' | sed 's#$(RECIPES)/files/ndk##'` ; do mkdir -p $(PREFIX)/$(TARGET_NAME)$$dir ; done - for file in `find $(RECIPES)/files/ndk/ -type f | grep -v '\.svn' | sed 's#$(RECIPES)/files/ndk##'` ; do cp -p $(RECIPES)/files/ndk$$file $(PREFIX)/$(TARGET_NAME)$$file ; done + mkdir -p $(BUILDDIR)/ndk + lha xw=$(BUILDDIR)/ndk $(SOURCESDIR)/$(UPSTREAM_NDK_TARBALL) + mkdir -p $(PREFIX)/$(TARGET_NAME)/sys-include + cp -r $(BUILDDIR)/ndk/NDK3.2/Include_H/* $(PREFIX)/$(TARGET_NAME)/sys-include mkdir -p $(BUILDDIR)/openurl cd $(BUILDDIR)/openurl && tar xaf $(SOURCESDIR)/$(UPSTREAM_OPENURL_TARBALL) cp -r $(BUILDDIR)/openurl/libopenurl-$(UPSTREAM_OPENURL_VERSION)/include/* $(PREFIX)/$(TARGET_NAME)/sys-include/ diff --git a/m68k-unknown-amigaos/recipes/patches/clib2/amiga_invertstring.c.p b/m68k-unknown-amigaos/recipes/patches/clib2/amiga_invertstring.c.p new file mode 100644 index 0000000..9f74bd9 --- /dev/null +++ b/m68k-unknown-amigaos/recipes/patches/clib2/amiga_invertstring.c.p @@ -0,0 +1,11 @@ +--- ./builddir/clib2/amiga_invertstring.c 2017-05-01 17:06:23.000000000 +0100 ++++ ./amiga_invertstring.c 2021-06-08 14:18:03.132632551 +0100 +@@ -138,7 +138,7 @@ extern VOID FreeIEvents(struct InputEven + /****************************************************************************/ + + struct InputEvent * +-InvertString(CONST_STRPTR str, CONST struct KeyMap *km) ++InvertString(STRPTR str, CONST struct KeyMap *km) + { + /* bugs: + can't escape '>' diff --git a/sdk/Makefile b/sdk/Makefile index de5ec55..86aa68c 100644 --- a/sdk/Makefile +++ b/sdk/Makefile @@ -43,7 +43,7 @@ VERSION_LIBWEBP := 1.0.3 # https://c-ares.haxx.se/ VERSION_LIBCARES := 1.15.0 # https://curl.haxx.se/ -VERSION_LIBCURL := 7.76.1 +VERSION_LIBCURL := 7.77.0 VERSION_LIBGNURX := 2.5.1 # http://mission-base.com/peter/source/ VERSION_LIBPBL := 1_04 |