Fix build under Solaris, in particular with the SunStudio compiler.

3 files changed, 40 insertions, 1 deletions

diff --git a/lang/gawk/distinfo b/lang/gawk/distinfo
index b9f7e0f80e5..de816130967 100644
--- a/lang/gawk/distinfo
+++ b/lang/gawk/distinfo
@@ -1,9 +1,11 @@
-$NetBSD: distinfo,v 1.26 2013/12/15 09:42:14 richard Exp $
+$NetBSD: distinfo,v 1.27 2013/12/26 19:19:31 tron Exp $
 
 SHA1 (gawk-4.1.0.tar.xz) = caabca3c1a59d05807c826c45a4639b82cad612a
 RMD160 (gawk-4.1.0.tar.xz) = 71267e56aabed02ecc77f26661171a7b626dc71d
 Size (gawk-4.1.0.tar.xz) = 2049080 bytes
 SHA1 (patch-Makefile.in) = 12eb8f205fa224634b9f5122cfca55803382516f
+SHA1 (patch-awk.h) = 2292be5ec392e7fea5688fbb18012a735e43803f
 SHA1 (patch-extension_configure) = f53c897d1931a139a0bdaad69234a7530db6c838
+SHA1 (patch-extension_filefuncs.c) = 959868fabf63beb52014e039de84493dca125a0a
 SHA1 (patch-getopt.c) = ec519d4276fab67b350cb934b2a9959e1dbf8a2f
 SHA1 (patch-test_Makefile.in) = 19ce59a4e72fde4901c83af9b9472b9260fda228
diff --git a/lang/gawk/patches/patch-awk.h b/lang/gawk/patches/patch-awk.h
new file mode 100644
index 00000000000..3db0683e8b0
--- /dev/null
+++ b/lang/gawk/patches/patch-awk.h
@@ -0,0 +1,18 @@
+$NetBSD: patch-awk.h,v 1.1 2013/12/26 19:19:32 tron Exp $
+
+Fix build problem with SunStudio compiler under Solaris. Patch taken
+from here:
+
+http://lists.gnu.org/archive/html/bug-gawk/2011-07/msg00008.html
+
+--- awk.h.orig	2013-04-07 18:54:28.000000000 +0100
++++ awk.h	2013-12-26 19:03:34.000000000 +0000
+@@ -69,7 +69,7 @@
+ #endif /* LOCALEDIR */
+ #endif
+ 
+-#if !defined(__STDC__) || __STDC__ < 1
++#if !defined(__STDC__) || __STDC__ < 1 && !defined(__EXTENSIONS__)
+ #error "gawk no longer supports non-C89 environments (no __STDC__ or __STDC__ < 1)"
+ #endif
+ 
diff --git a/lang/gawk/patches/patch-extension_filefuncs.c b/lang/gawk/patches/patch-extension_filefuncs.c
new file mode 100644
index 00000000000..b1077d09631
--- /dev/null
+++ b/lang/gawk/patches/patch-extension_filefuncs.c
@@ -0,0 +1,19 @@
+$NetBSD: patch-extension_filefuncs.c,v 1.1 2013/12/26 19:19:32 tron Exp $
+
+Fix build problem under Solaris. The more elegant fix is available here:
+
+http://lists.gnu.org/archive/html/bug-gawk/2013-06/msg00010.html
+
+--- extension/filefuncs.c.orig	2013-05-02 20:51:30.000000000 +0100
++++ extension/filefuncs.c	2013-12-26 19:12:54.000000000 +0000
+@@ -75,6 +75,10 @@
+ #define minor(s) (0)
+ #endif
+ 
++#ifdef __sun
++#include <sys/mkdev.h>
++#endif
++
+ static const gawk_api_t *api;	/* for convenience macros to work */
+ static awk_ext_id_t *ext_id;
+ static awk_bool_t init_filefuncs(void);