Gitweb links:
...log
http://git.netsurf-browser.org/toolchains.git/shortlog/6f7b04741e1f7354ee332fb5af681540757188f9
...commit
http://git.netsurf-browser.org/toolchains.git/commit/6f7b04741e1f7354ee332fb5af681540757188f9
...tree
http://git.netsurf-browser.org/toolchains.git/tree/6f7b04741e1f7354ee332fb5af681540757188f9
The branch, master has been updated
via 6f7b04741e1f7354ee332fb5af681540757188f9 (commit)
from 0eadab86611f2881c3ca02a1d1438a96fd126995 (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=6f7b04741e1f7354ee332fb5af681540757188f9
commit 6f7b04741e1f7354ee332fb5af681540757188f9
Author: Daniel Silverstone <[email protected]>
Commit: Daniel Silverstone <[email protected]>
amigaos3: Add patch so toolchain can build on newer Debian
Signed-off-by: Daniel Silverstone <[email protected]>
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
+ <stdio.h>, 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;
-----------------------------------------------------------------------
Summary of changes:
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
+ <stdio.h>, 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;
--
Cross-compilation toolchains and environments
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
