toolchain/53511: Fix compiling flex on a Solaris 11 host system

[palle%netbsd.org@localhost]

>Number:         53511
>Category:       toolchain
>Synopsis:       Fix compiling flex on a Solaris 11 host system
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    toolchain-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sat Aug 11 13:35:00 +0000 2018
>Originator:     Palle Lyckegaard
>Release:        current as of 2018-08-11
>Organization:
NetBSD
>Environment:
SunOS solaris 5.11 11.4.0.3.0 i86pc i386 i86pc

>Description:
Compiler error:

In file included from /export/home/palle/data/netbsd/current/src/tools/compat/regex.h:3:0,
                 from /export/home/palle/data/netbsd/current/src/external/bsd/flex/dist/src/flexdef.h:82,
                 from /export/home/palle/data/netbsd/current/src/external/bsd/flex/dist/src/buf.c:35:
/export/home/palle/data/netbsd/current/src/tools/compat/../../include/regex.h:135:1: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'int'
 int regcomp(regex_t * __restrict, const char * __restrict, int);
 ^~~
In file included from /export/home/palle/data/netbsd/current/src/external/bsd/flex/dist/src/flexint.h:19:0,
                 from /export/home/palle/data/netbsd/current/src/external/bsd/flex/dist/src/flexdef.h:84,
                 from /export/home/palle/data/netbsd/current/src/external/bsd/flex/dist/src/buf.c:35:
/usr/include/inttypes.h:57:1: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'typedef'
 typedef struct {
 ^~~~~~~
--- ccl.lo ---
In file included from /export/home/palle/data/netbsd/current/src/tools/compat/regex.h:3:0,
                 from /export/home/palle/data/netbsd/current/src/external/bsd/flex/dist/src/flexdef.h:82,
                 from /export/home/palle/data/netbsd/current/src/external/bsd/flex/dist/src/ccl.c:33:
/export/home/palle/data/netbsd/current/src/tools/compat/../../include/regex.h:135:1: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'int'
 int regcomp(regex_t * __restrict, const char * __restrict, int);
 ^~~
In file included from /export/home/palle/data/netbsd/current/src/external/bsd/flex/dist/src/flexint.h:19:0,
                 from /export/home/palle/data/netbsd/current/src/external/bsd/flex/dist/src/flexdef.h:84,
                 from /export/home/palle/data/netbsd/current/src/external/bsd/flex/dist/src/ccl.c:33:
/usr/include/inttypes.h:57:1: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'typedef'
^~~~~~~

>How-To-Repeat:
Do a standard build.sh release on a Solaris 11 system (Solaris 11.4 beta)
>Fix:
Patch below fixes the problem:


Index: external/bsd/flex/dist/src/flexdef.h
===================================================================
RCS file: /cvsroot/src/external/bsd/flex/dist/src/flexdef.h,v
retrieving revision 1.3
diff -u -r1.3 flexdef.h
--- external/bsd/flex/dist/src/flexdef.h	2 Jan 2017 17:45:27 -0000	1.3
+++ external/bsd/flex/dist/src/flexdef.h	10 Aug 2018 13:56:28 -0000
@@ -36,6 +36,10 @@
 #ifndef FLEXDEF_H
 #define FLEXDEF_H 1
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif