diff options
author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2021-07-06 14:08:49 +0100 |
---|---|---|
committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2021-07-06 14:08:49 +0100 |
commit | 2ae3ecf3d5913f6971d45abc2df96663e0db691e (patch) | |
tree | 3cd8a15191381409164dd8bbb56f06451dfcc871 | |
parent | 26bf2874121f488ef2d08c1b306ab98bb11a5f09 (diff) | |
download | toolchains-2ae3ecf3d5913f6971d45abc2df96663e0db691e.tar.gz toolchains-2ae3ecf3d5913f6971d45abc2df96663e0db691e.tar.bz2 |
m68k-amigaos: fix patching of NDK
-rw-r--r-- | m68k-unknown-amigaos/Makefile | 3 | ||||
-rw-r--r-- | m68k-unknown-amigaos/recipes/files/ndk/Include_H/inline/Picasso96.h (renamed from m68k-unknown-amigaos/recipes/files/ndk/sys-include/inline/Picasso96.h) | 0 | ||||
-rw-r--r-- | m68k-unknown-amigaos/recipes/files/ndk/Include_H/inline/guigfx.h (renamed from m68k-unknown-amigaos/recipes/files/ndk/sys-include/inline/guigfx.h) | 0 | ||||
-rw-r--r-- | m68k-unknown-amigaos/recipes/files/ndk/Include_H/inline/macros.h (renamed from m68k-unknown-amigaos/recipes/files/ndk/sys-include/inline/macros.h) | 0 | ||||
-rw-r--r-- | m68k-unknown-amigaos/recipes/files/ndk/Include_H/inline/mathieeedoubbas.h (renamed from m68k-unknown-amigaos/recipes/files/ndk/sys-include/inline/mathieeedoubbas.h) | 0 | ||||
-rw-r--r-- | m68k-unknown-amigaos/recipes/files/ndk/Include_H/inline/mathieeedoubtrans.h (renamed from m68k-unknown-amigaos/recipes/files/ndk/sys-include/inline/mathieeedoubtrans.h) | 0 | ||||
-rw-r--r-- | m68k-unknown-amigaos/recipes/files/ndk/Include_H/libraries/Picasso96.h (renamed from m68k-unknown-amigaos/recipes/files/ndk/sys-include/libraries/Picasso96.h) | 0 | ||||
-rw-r--r-- | m68k-unknown-amigaos/recipes/files/ndk/Include_H/proto/Picasso96API.h (renamed from m68k-unknown-amigaos/recipes/files/ndk/sys-include/proto/Picasso96API.h) | 0 | ||||
-rw-r--r-- | m68k-unknown-amigaos/recipes/patches/ndk/ndk.inline.intuition.h.p | 11 |
9 files changed, 3 insertions, 11 deletions
diff --git a/m68k-unknown-amigaos/Makefile b/m68k-unknown-amigaos/Makefile index 7d0e0ea..df1f4bd 100644 --- a/m68k-unknown-amigaos/Makefile +++ b/m68k-unknown-amigaos/Makefile @@ -127,6 +127,9 @@ $(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 $(BUILDDIR)/ndk lha xw=$(BUILDDIR)/ndk $(SOURCESDIR)/$(UPSTREAM_NDK_TARBALL) + for p in `ls $(RECIPES)/patches/ndk/*.p` ; do patch -d $(BUILDDIR)/ndk -p0 <$$p || exit $0 ; done + for dir in `find $(RECIPES)/files/ndk/ -type d | grep -v '\.svn' | sed 's#$(RECIPES)/files/ndk##'` ; do mkdir -p $(BUILDDIR)/ndk/NDK3.2$$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 $(BUILDDIR)/ndk/NDK3.2$$file ; done mkdir -p $(PREFIX)/$(TARGET_NAME)/sys-include cp -r $(BUILDDIR)/ndk/NDK3.2/Include_H/* $(PREFIX)/$(TARGET_NAME)/sys-include mkdir -p $(BUILDDIR)/openurl diff --git a/m68k-unknown-amigaos/recipes/files/ndk/sys-include/inline/Picasso96.h b/m68k-unknown-amigaos/recipes/files/ndk/Include_H/inline/Picasso96.h index 74443cb..74443cb 100644 --- a/m68k-unknown-amigaos/recipes/files/ndk/sys-include/inline/Picasso96.h +++ b/m68k-unknown-amigaos/recipes/files/ndk/Include_H/inline/Picasso96.h diff --git a/m68k-unknown-amigaos/recipes/files/ndk/sys-include/inline/guigfx.h b/m68k-unknown-amigaos/recipes/files/ndk/Include_H/inline/guigfx.h index a12650a..a12650a 100644 --- a/m68k-unknown-amigaos/recipes/files/ndk/sys-include/inline/guigfx.h +++ b/m68k-unknown-amigaos/recipes/files/ndk/Include_H/inline/guigfx.h diff --git a/m68k-unknown-amigaos/recipes/files/ndk/sys-include/inline/macros.h b/m68k-unknown-amigaos/recipes/files/ndk/Include_H/inline/macros.h index 2a07ae6..2a07ae6 100644 --- a/m68k-unknown-amigaos/recipes/files/ndk/sys-include/inline/macros.h +++ b/m68k-unknown-amigaos/recipes/files/ndk/Include_H/inline/macros.h diff --git a/m68k-unknown-amigaos/recipes/files/ndk/sys-include/inline/mathieeedoubbas.h b/m68k-unknown-amigaos/recipes/files/ndk/Include_H/inline/mathieeedoubbas.h index 8b711db..8b711db 100644 --- a/m68k-unknown-amigaos/recipes/files/ndk/sys-include/inline/mathieeedoubbas.h +++ b/m68k-unknown-amigaos/recipes/files/ndk/Include_H/inline/mathieeedoubbas.h diff --git a/m68k-unknown-amigaos/recipes/files/ndk/sys-include/inline/mathieeedoubtrans.h b/m68k-unknown-amigaos/recipes/files/ndk/Include_H/inline/mathieeedoubtrans.h index 0ccfa69..0ccfa69 100644 --- a/m68k-unknown-amigaos/recipes/files/ndk/sys-include/inline/mathieeedoubtrans.h +++ b/m68k-unknown-amigaos/recipes/files/ndk/Include_H/inline/mathieeedoubtrans.h diff --git a/m68k-unknown-amigaos/recipes/files/ndk/sys-include/libraries/Picasso96.h b/m68k-unknown-amigaos/recipes/files/ndk/Include_H/libraries/Picasso96.h index a9fcd49..a9fcd49 100644 --- a/m68k-unknown-amigaos/recipes/files/ndk/sys-include/libraries/Picasso96.h +++ b/m68k-unknown-amigaos/recipes/files/ndk/Include_H/libraries/Picasso96.h diff --git a/m68k-unknown-amigaos/recipes/files/ndk/sys-include/proto/Picasso96API.h b/m68k-unknown-amigaos/recipes/files/ndk/Include_H/proto/Picasso96API.h index 8ba2f0c..8ba2f0c 100644 --- a/m68k-unknown-amigaos/recipes/files/ndk/sys-include/proto/Picasso96API.h +++ b/m68k-unknown-amigaos/recipes/files/ndk/Include_H/proto/Picasso96API.h diff --git a/m68k-unknown-amigaos/recipes/patches/ndk/ndk.inline.intuition.h.p b/m68k-unknown-amigaos/recipes/patches/ndk/ndk.inline.intuition.h.p deleted file mode 100644 index c322504..0000000 --- a/m68k-unknown-amigaos/recipes/patches/ndk/ndk.inline.intuition.h.p +++ /dev/null @@ -1,11 +0,0 @@ ---- sys-include/inline/intuition.h 2006-05-10 18:29:23.000000000 +0100 -+++ sys-include/inline/intuition.h 2016-02-29 00:06:48.824015807 +0000 -@@ -448,7 +448,7 @@ - LP3(0x27c, APTR, NewObjectA, struct IClass *, classPtr, a0, CONST_STRPTR, classID, a1, const struct TagItem *, tagList, a2, \ - , INTUITION_BASE_NAME) - --#ifndef NO_INLINE_STDARG -+#if 0 - __inline APTR NewObject(struct IClass * classPtr, CONST_STRPTR classID, ULONG tagList, ...) - { - return NewObjectA(classPtr, classID, (const struct TagItem *) &tagList); |