Thu Dec 26 19:19:32 2013 UTC ()
Fix build under Solaris, in particular with the SunStudio compiler.


(tron)
diff -r1.26 -r1.27 pkgsrc/lang/gawk/distinfo
diff -r0 -r1.1 pkgsrc/lang/gawk/patches/patch-awk.h
diff -r0 -r1.1 pkgsrc/lang/gawk/patches/patch-extension_filefuncs.c
cvs diff -r1.26 -r1.27 pkgsrc/lang/gawk/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/gawk/distinfo 2013/12/15 09:42:14 1.26
+++ pkgsrc/lang/gawk/distinfo 2013/12/26 19:19:31 1.27
@@ -1,9 +1,11 @@ @@ -1,9 +1,11 @@
1$NetBSD: distinfo,v 1.26 2013/12/15 09:42:14 richard Exp $ 1$NetBSD: distinfo,v 1.27 2013/12/26 19:19:31 tron Exp $
2 2
3SHA1 (gawk-4.1.0.tar.xz) = caabca3c1a59d05807c826c45a4639b82cad612a 3SHA1 (gawk-4.1.0.tar.xz) = caabca3c1a59d05807c826c45a4639b82cad612a
4RMD160 (gawk-4.1.0.tar.xz) = 71267e56aabed02ecc77f26661171a7b626dc71d 4RMD160 (gawk-4.1.0.tar.xz) = 71267e56aabed02ecc77f26661171a7b626dc71d
5Size (gawk-4.1.0.tar.xz) = 2049080 bytes 5Size (gawk-4.1.0.tar.xz) = 2049080 bytes
6SHA1 (patch-Makefile.in) = 12eb8f205fa224634b9f5122cfca55803382516f 6SHA1 (patch-Makefile.in) = 12eb8f205fa224634b9f5122cfca55803382516f
 7SHA1 (patch-awk.h) = 2292be5ec392e7fea5688fbb18012a735e43803f
7SHA1 (patch-extension_configure) = f53c897d1931a139a0bdaad69234a7530db6c838 8SHA1 (patch-extension_configure) = f53c897d1931a139a0bdaad69234a7530db6c838
 9SHA1 (patch-extension_filefuncs.c) = 959868fabf63beb52014e039de84493dca125a0a
8SHA1 (patch-getopt.c) = ec519d4276fab67b350cb934b2a9959e1dbf8a2f 10SHA1 (patch-getopt.c) = ec519d4276fab67b350cb934b2a9959e1dbf8a2f
9SHA1 (patch-test_Makefile.in) = 19ce59a4e72fde4901c83af9b9472b9260fda228 11SHA1 (patch-test_Makefile.in) = 19ce59a4e72fde4901c83af9b9472b9260fda228
File Added: pkgsrc/lang/gawk/patches/Attic/patch-awk.h
$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
File Added: pkgsrc/lang/gawk/patches/Attic/patch-extension_filefuncs.c
$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);