From 6f7b04741e1f7354ee332fb5af681540757188f9 Mon Sep 17 00:00:00 2001 From: Daniel Silverstone Date: Wed, 11 Mar 2020 10:14:11 +0000 Subject: amigaos3: Add patch so toolchain can build on newer Debian Signed-off-by: Daniel Silverstone --- m68k-unknown-amigaos/Makefile | 1 + m68k-unknown-amigaos/recipes/patches/bison/fseterr.c.p | 11 +++++++++++ 2 files changed, 12 insertions(+) create mode 100644 m68k-unknown-amigaos/recipes/patches/bison/fseterr.c.p diff --git a/m68k-unknown-amigaos/Makefile b/m68k-unknown-amigaos/Makefile index 066c0dd..5c66cdd 100644 --- a/m68k-unknown-amigaos/Makefile +++ b/m68k-unknown-amigaos/Makefile @@ -208,6 +208,7 @@ $(BUILDSTEPS)/bison.d: $(BUILDSTEPS)/srcdir-bison.d $(BUILDSTEPS)/srcdir-bison.d: $(BUILDSTEPS)/$(UPSTREAM_BISON_TARBALL).d tar axf $(SOURCESDIR)/$(UPSTREAM_BISON_TARBALL) mv bison-$(UPSTREAM_BISON_VERSION) $(BISON_SRCDIR) + for p in `ls $(RECIPES)/patches/bison/*.p` ; do patch -d $(BISON_SRCDIR) -p0 <$$p ; done touch $@ $(BUILDSTEPS)/$(UPSTREAM_BISON_TARBALL).d: $(BUILDSTEPS)/buildsteps.d $(SOURCESDIR)/$(UPSTREAM_BISON_TARBALL) diff --git a/m68k-unknown-amigaos/recipes/patches/bison/fseterr.c.p b/m68k-unknown-amigaos/recipes/patches/bison/fseterr.c.p new file mode 100644 index 0000000..a47a2f9 --- /dev/null +++ b/m68k-unknown-amigaos/recipes/patches/bison/fseterr.c.p @@ -0,0 +1,11 @@ +--- lib/fseterr.c.old 2020-03-11 10:08:25.275228721 +0000 ++++ lib/fseterr.c 2020-03-11 10:08:35.199250194 +0000 +@@ -29,7 +29,7 @@ + /* Most systems provide FILE as a struct and the necessary bitmask in + , because they need it for implementing getc() and putc() as + fast macros. */ +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + fp->_flags |= _IO_ERR_SEEN; + #elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */ + fp_->_flags |= __SERR; -- cgit v1.2.3