[src/trunk]: src Gettext assumes a C99 environment with stdbool.h or configur...

[jmc <jmc%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/879105bbb095
branches:  trunk
changeset: 580807:879105bbb095
user:      jmc <jmc%NetBSD.org@localhost>
date:      Mon May 09 17:19:06 2005 +0000

description:
Gettext assumes a C99 environment with stdbool.h or configure would provide one
from a template. As we do a reach over build, for vax builds provide stdbool.h
locally from that template.

diffstat:

 doc/HACKS                             |  15 ++++++++++++++-
 gnu/usr.bin/gettext/Makefile.inc.prog |  13 ++++++++++++-
 gnu/usr.bin/gettext/libgrep/Makefile  |  13 ++++++++++++-
 gnu/usr.bin/gettext/libnlspr/Makefile |  13 ++++++++++++-
 gnu/usr.bin/gettext/libnlsut/Makefile |  13 ++++++++++++-
 5 files changed, 62 insertions(+), 5 deletions(-)

diffs (130 lines):

diff -r ef95a926b9bc -r 879105bbb095 doc/HACKS
--- a/doc/HACKS Mon May 09 16:15:48 2005 +0000
+++ b/doc/HACKS Mon May 09 17:19:06 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: HACKS,v 1.44 2005/05/06 19:32:30 jmc Exp $
+# $NetBSD: HACKS,v 1.45 2005/05/09 17:19:06 jmc Exp $
 #
 # This file is intended to document workarounds for currently unsolved
 # (mostly) compiler bugs.
@@ -113,6 +113,19 @@
 
 port   vax
 
+       hack    gcc 2.95/vax doesn't have stdbool.h and gettext needs it
+       cdate   Mon May  9 12:16:22 CDT 2005
+       who     jmc
+       file    gnu/usr.bin/gettext/Makefile.inc.prog 1.5
+               gnu/usr.bin/gettext/libgrep/Makefile 1.3
+               gnu/usr.bin/gettext/libnlspr/Makefile 1.5
+               gnu/usr.bin/gettext/libnlsut/Makefile 1.3   
+       descr
+               The latest gettext assumes a C99 environment or at least
+               configure checks to work around this. As we don't use configure
+               provide a stdbool.h for vax builds locally in directories from
+               the template provided by the gettext code.
+       
        hack    gcc 2.95/vax can't handle __used__ in mcount.c
        cdate   Fri May  6 14:30:53 CDT 2005
        who     jmc
diff -r ef95a926b9bc -r 879105bbb095 gnu/usr.bin/gettext/Makefile.inc.prog
--- a/gnu/usr.bin/gettext/Makefile.inc.prog     Mon May 09 16:15:48 2005 +0000
+++ b/gnu/usr.bin/gettext/Makefile.inc.prog     Mon May 09 17:19:06 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc.prog,v 1.4 2005/04/29 15:05:01 christos Exp $
+#      $NetBSD: Makefile.inc.prog,v 1.5 2005/05/09 17:19:06 jmc Exp $
 
 .include <bsd.own.mk>
 
@@ -23,3 +23,14 @@
 
 .PATH: ${TOOLTOP}
 CPPFLAGS+=     -I${TOOLTOP}
+
+.if ${MACHINE_ARCH} == "vax"
+depend dependall realdepend realall: stdbool.h
+
+stdbool.h:
+       sed -e 's:@HAVE__BOOL@:0:g' \
+               ${DIST}/gettext/gettext-tools/lib/stdbool_.h > stdbool.h
+
+CLEANFILES+=stdbool.h
+CPPFLAGS+=-I.
+.endif
diff -r ef95a926b9bc -r 879105bbb095 gnu/usr.bin/gettext/libgrep/Makefile
--- a/gnu/usr.bin/gettext/libgrep/Makefile      Mon May 09 16:15:48 2005 +0000
+++ b/gnu/usr.bin/gettext/libgrep/Makefile      Mon May 09 17:19:06 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2005/04/29 15:05:01 christos Exp $
+#      $NetBSD: Makefile,v 1.3 2005/05/09 17:19:06 jmc Exp $
 
 MKPRIVATELIB=  yes
 
@@ -21,4 +21,15 @@
 .PATH: ${DIST}/gettext/gettext-tools/libgrep 
 CPPFLAGS+= -I${DIST}/gettext/gettext-tools/libgrep
 
+.if ${MACHINE_ARCH} == "vax"
+depend dependall realdepend realall: stdbool.h
+
+stdbool.h:
+       sed -e 's:@HAVE__BOOL@:0:g' \
+               ${DIST}/gettext/gettext-tools/lib/stdbool_.h > stdbool.h
+
+CLEANFILES+=stdbool.h
+CPPFLAGS+=-I.
+.endif
+
 .include <bsd.lib.mk>
diff -r ef95a926b9bc -r 879105bbb095 gnu/usr.bin/gettext/libnlspr/Makefile
--- a/gnu/usr.bin/gettext/libnlspr/Makefile     Mon May 09 16:15:48 2005 +0000
+++ b/gnu/usr.bin/gettext/libnlspr/Makefile     Mon May 09 17:19:06 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.4 2005/05/06 21:02:21 jmc Exp $
+#      $NetBSD: Makefile,v 1.5 2005/05/09 17:19:06 jmc Exp $
 
 MKPRIVATELIB=  yes
 
@@ -74,6 +74,17 @@
 CPPFLAGS+=-DGETTEXTJAR=\"${DESTDIR}/usr/share/gettext/gettext.jar\"
 CPPFLAGS+=-DGETTEXTDATADIR=\"${DESTDIR}/usr/share/gettext\"
 
+.if ${MACHINE_ARCH} == "vax"
+depend dependall realdepend realall: stdbool.h
+
+stdbool.h:
+       sed -e 's:@HAVE__BOOL@:0:g' \
+               ${DIST}/gettext/gettext-tools/lib/stdbool_.h > stdbool.h
+
+CLEANFILES+=stdbool.h
+CPPFLAGS+=-I.
+.endif
+
 .include <bsd.lib.mk>
 
 # Override <sys.mk> double suffix rules to prevent *.y being yacced to *.[ch]
diff -r ef95a926b9bc -r 879105bbb095 gnu/usr.bin/gettext/libnlsut/Makefile
--- a/gnu/usr.bin/gettext/libnlsut/Makefile     Mon May 09 16:15:48 2005 +0000
+++ b/gnu/usr.bin/gettext/libnlsut/Makefile     Mon May 09 17:19:06 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2005/04/29 15:05:01 christos Exp $
+#      $NetBSD: Makefile,v 1.3 2005/05/09 17:19:06 jmc Exp $
 
 MKPRIVATELIB=  yes
 
@@ -61,4 +61,15 @@
 
 CPPFLAGS+=-DEXEEXT=\"\"
 
+.if ${MACHINE_ARCH} == "vax"
+depend dependall realdepend realall: stdbool.h
+
+stdbool.h:
+       sed -e 's:@HAVE__BOOL@:0:g' \
+               ${DIST}/gettext/gettext-tools/lib/stdbool_.h > stdbool.h
+
+CLEANFILES+=stdbool.h
+CPPFLAGS+=-I.
+.endif
+
 .include <bsd.lib.mk>