From 96db3fbded81fdac9ae189ab16bc5098271eebb6 Mon Sep 17 00:00:00 2001 From: sevan Date: Sun, 28 Oct 2018 20:53:44 +0000 Subject: Unbreak build on Minix 3 --- devel/m4/distinfo | 4 +++- devel/m4/patches/patch-lib_fseeko.c | 15 +++++++++++++++ devel/m4/patches/patch-lib_stdio-impl.h | 15 +++++++++++++++ 3 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 devel/m4/patches/patch-lib_fseeko.c create mode 100644 devel/m4/patches/patch-lib_stdio-impl.h (limited to 'devel') diff --git a/devel/m4/distinfo b/devel/m4/distinfo index 2150f67a628..37f8bf8d442 100644 --- a/devel/m4/distinfo +++ b/devel/m4/distinfo @@ -1,11 +1,13 @@ -$NetBSD: distinfo,v 1.44 2018/09/25 20:21:51 joerg Exp $ +$NetBSD: distinfo,v 1.45 2018/10/28 20:53:44 sevan Exp $ SHA1 (m4-1.4.18.tar.gz) = 2f76f8105a45b05c8cfede97b3193cd88b31c657 RMD160 (m4-1.4.18.tar.gz) = 16396a6ffbb2105cdd0a36c773b44d16854ed740 SHA512 (m4-1.4.18.tar.gz) = 29254dd4267a093e8d9da3a26df8b02564044cdb4506be539ec1aff4e5d406477bcf32f5e813c840f3aec77293bfe2cdde18f6a21724a7e0bfff646ec88b74ae Size (m4-1.4.18.tar.gz) = 2006643 bytes SHA1 (patch-isnan.c) = a960f35e5168bed47c5924e36bfb254dc1a44621 +SHA1 (patch-lib_fseeko.c) = d8531a1f7e0a941228deddc1eba522f0263ca783 SHA1 (patch-lib_getprogname.c) = 3a8e7c028342ef3a9f86839f1a5ae36571a65f12 +SHA1 (patch-lib_stdio-impl.h) = 8b58d52439a5f9d23043c22c702fd4c41f781fda SHA1 (patch-lib_stdio.in.h) = 21557ea9d86dbeb36062df4e62cb71735b06480b SHA1 (patch-lib_vasnprintf.c) = 2bced6c121efc9bc5894174c7745ba89e8f53033 SHA1 (patch-lib_xalloc-oversized.h) = 9e74adec2f43770d419f60d5c3e7bdea2424daa6 diff --git a/devel/m4/patches/patch-lib_fseeko.c b/devel/m4/patches/patch-lib_fseeko.c new file mode 100644 index 00000000000..2b10d81bc3d --- /dev/null +++ b/devel/m4/patches/patch-lib_fseeko.c @@ -0,0 +1,15 @@ +$NetBSD: patch-lib_fseeko.c,v 1.1 2018/10/28 20:53:44 sevan Exp $ + +Treat Minix 3 same as NetBSD + +--- lib/fseeko.c.orig 2018-10-28 20:33:23.728090000 +0000 ++++ lib/fseeko.c +@@ -128,7 +128,7 @@ fseeko (FILE *fp, off_t offset, int when + fp->_offset = pos; + #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */ +-# if defined __CYGWIN__ || (defined __NetBSD__ && __NetBSD_Version__ >= 600000000) ++# if defined __CYGWIN__ || (defined __NetBSD__ && __NetBSD_Version__ >= 600000000) || defined __Minix__ + /* fp_->_offset is typed as an integer. */ + fp_->_offset = pos; + # else diff --git a/devel/m4/patches/patch-lib_stdio-impl.h b/devel/m4/patches/patch-lib_stdio-impl.h new file mode 100644 index 00000000000..cf36733e58a --- /dev/null +++ b/devel/m4/patches/patch-lib_stdio-impl.h @@ -0,0 +1,15 @@ +$NetBSD: patch-lib_stdio-impl.h,v 1.1 2018/10/28 20:53:44 sevan Exp $ + +Treat Minix 3 same as NetBSD + +--- lib/stdio-impl.h.orig 2018-10-28 20:27:54.933015000 +0000 ++++ lib/stdio-impl.h +@@ -58,7 +58,7 @@ + # define fp_ fp + # endif + +-# if (defined __NetBSD__ && __NetBSD_Version__ >= 105270000) || defined __OpenBSD__ || defined __ANDROID__ /* NetBSD >= 1.5ZA, OpenBSD, Android */ ++# if (defined __NetBSD__ && __NetBSD_Version__ >= 105270000) || defined __OpenBSD__ || defined __ANDROID__ || defined __Minix__ /* NetBSD >= 1.5ZA, OpenBSD, Android, Minix3 */ + /* See + and */ + struct __sfileext -- cgit v1.2.3