From: David Levine Date: Wed, 23 Oct 2013 16:24:34 +0000 (-0500) Subject: Success! Clean build on the buildbot Solaris11 host. X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/b63aeb3f0b2d2924480f6d2b4d50fe08b1f3de21?ds=sidebyside;hp=bac72c895a8b962619defed7621b25c33b3c6232 Success! Clean build on the buildbot Solaris11 host. --- diff --git a/configure.ac b/configure.ac index 6ff7c9df..38e2a58b 100644 --- a/configure.ac +++ b/configure.ac @@ -565,7 +565,7 @@ dnl http://sourceforge.net/p/flex/bugs/140/ AS_IF([test "$LEX" = flex], [AS_CASE([`$LEX -V`], [flex\ 2.5.35], [[LFLAGS=\ -'; cp -p $@ $@.ORIGINAL; printf "%s\n" '\''1,$$s/(size_t) \(num_to_read\)/\1/'\'' w q | ed -s $@; diff $@ $@.ORIGINAL || true']], +'; printf "%s\n" '\''1,$$s/(size_t) \(num_to_read\)/\1/'\'' w q | ed -s $@']], [flex\ 2.5.3@<:@67@:>@], [[LFLAGS=\ '; printf "%s\n" '\''1,$$s/\( \)int i;/\1yy_size_t i;/'\'' w q | ed -s $@']]) AC_SUBST([LFLAGS])]) diff --git a/docs/contrib/build_nmh b/docs/contrib/build_nmh index ef399f86..adc6e1cb 100755 --- a/docs/contrib/build_nmh +++ b/docs/contrib/build_nmh @@ -307,15 +307,14 @@ if [ $status -eq 0 ]; then fi fi -grep 'Error' "$logfile" -#### Ignore the warning when sbr/dtimep.c is built with flex 2.5.36 -#### or 2.5.37. -grep 'warn' "$logfile" | \ - grep -v 'sbr/dtimep.c:.*comparison between signed and unsigned' -if [ $status -ne 0 ]; then +grep Error "$logfile" +grep warn "$logfile" + +if [ $status -eq 0 ]; then + [ $verbose -ge 1 ] && echo build completed successfully +else echo build failed! echo build log is in "$logfile" fi -[ $status -eq 0 -a $verbose -ge 1 ] && echo build completed successfully exit $status