From 22b5f089beded6b50a442259a8e9595869b61f59 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 16 Apr 2016 14:04:27 +0300 Subject: Fix the DJGPP build. --- pc/ChangeLog | 5 +++++ pc/config.sed | 8 +++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/pc/ChangeLog b/pc/ChangeLog index b8490aad..ead8cf7d 100644 --- a/pc/ChangeLog +++ b/pc/ChangeLog @@ -1,3 +1,8 @@ +2016-04-16 Eli Zaretskii + + * config.sed (HAVE_BTOWC): Now unconditionally defined to 1. + (HAVE_SYS_WAIT_H): Define to 1 for DJGPP. + 2016-04-08 Eli Zaretskii * Makefile.tst (BASIC_TESTS, GAWK_EXT_TESTS): Add new tests. diff --git a/pc/config.sed b/pc/config.sed index 024abab8..6d801e77 100644 --- a/pc/config.sed +++ b/pc/config.sed @@ -39,9 +39,7 @@ s/^#undef GETGROUPS_T *$/#define GETGROUPS_T gid_t/ s/^#undef HAVE_ALARM *$/#define HAVE_ALARM 1/ s/^#undef HAVE_ATEXIT *$/#define HAVE_ATEXIT 1/ /^#undef HAVE_BTOWC *$/c\ -#ifdef _WIN32\ -#define HAVE_BTOWC 1\ -#endif +#define HAVE_BTOWC 1 /^#undef HAVE_DECL_TZNAME *$/c\ #ifdef __MINGW32__\ #define HAVE_DECL_TZNAME 1\ @@ -182,6 +180,10 @@ s/^#undef HAVE_SYSTEM *$/#define HAVE_SYSTEM 1/ #define HAVE_SYS_TIME_H 1\ #endif s/^#undef HAVE_SYS_TYPES_H *$/#define HAVE_SYS_TYPES_H 1/ +/^#undef HAVE_SYS_WAIT_H *$/c\ +#ifdef __DJGPP__\ +#define HAVE_SYS_WAIT_H 1\ +#endif /^#undef HAVE_TOWLOWER *$/c\ #ifdef __MINGW32__\ #define HAVE_TOWLOWER 1\ -- cgit v1.2.3 From 905a15b753e8dd52aed7c98a42b3d5eaa8d98fb8 Mon Sep 17 00:00:00 2001 From: "Arnold D. Robbins" Date: Sun, 17 Apr 2016 05:37:32 +0300 Subject: Fix skipping of pty1 test on z/OS. --- test/ChangeLog | 4 ++++ test/Makefile.am | 2 +- test/Makefile.in | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/test/ChangeLog b/test/ChangeLog index 52c520c5..1b1648ba 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,7 @@ +2016-04-17 Arnold D. Robbins + + * Makefile.am (pty1): Really disable test on z/OS. + 2016-04-11 Arnold D. Robbins * clos1way2.ok, clos1way3.ok, clos1way4.ok, clos1way5.ok: Update diff --git a/test/Makefile.am b/test/Makefile.am index dfc9bbed..8ffe7dbc 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -2135,7 +2135,7 @@ watchpoint1: pty1: @echo $@ @case `uname` in \ - openedition*) : ;; \ + *[Oo][Ss]/390*) : ;; \ *) AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ ; \ $(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ ;; \ esac diff --git a/test/Makefile.in b/test/Makefile.in index 77c8a60a..c5bca01f 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -2574,7 +2574,7 @@ watchpoint1: pty1: @echo $@ @case `uname` in \ - openedition*) : ;; \ + *[Oo][Ss]/390*) : ;; \ *) AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ ; \ $(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ ;; \ esac -- cgit v1.2.3 From 9d8e5b6c4bc860b2866c54d6d8f41aba66cddec8 Mon Sep 17 00:00:00 2001 From: "Arnold D. Robbins" Date: Sun, 17 Apr 2016 05:51:03 +0300 Subject: Fixes to pc/Makefile.tst. --- pc/ChangeLog | 4 ++++ pc/Makefile.tst | 37 ++++++++++++++++++++++--------------- 2 files changed, 26 insertions(+), 15 deletions(-) diff --git a/pc/ChangeLog b/pc/ChangeLog index ead8cf7d..309369b1 100644 --- a/pc/ChangeLog +++ b/pc/ChangeLog @@ -1,3 +1,7 @@ +2016-04-17 Scott Deifik + + * Makefile.tst: Sync with mainline. + 2016-04-16 Eli Zaretskii * config.sed (HAVE_BTOWC): Now unconditionally defined to 1. diff --git a/pc/Makefile.tst b/pc/Makefile.tst index a8c1f529..9d0cfdcf 100644 --- a/pc/Makefile.tst +++ b/pc/Makefile.tst @@ -165,7 +165,8 @@ BASIC_TESTS = \ paramdup paramres paramtyp paramuninitglobal parse1 parsefld parseme \ pcntplus posix2008sub prdupval prec printf0 printf1 prmarscl prmreuse \ prt1eval prtoeval \ - rand range1 rebrackloc rebt8b1 redfilnm regeq regexpbrack regexpbrack2 \ + rand range1 readbuf rebrackloc rebt8b1 redfilnm \ + regeq regexpbrack regexpbrack2 \ regexprange regrange reindops \ reparse resplit rri1 rs rsnul1nl rsnulbig rsnulbig2 rstest1 rstest2 \ rstest3 rstest4 rstest5 rswhite \ @@ -220,6 +221,7 @@ SHLIB_TESTS = \ fnmatch filefuncs fork fork2 fts functab4 inplace1 inplace2 inplace3 \ ordchr ordchr2 readdir readfile readfile2 revout revtwoway rwarray testext time + # List of the tests which should be run with --lint option: NEED_LINT = \ defref fmtspcl lintwarn noeffect nofmtch shadow \ @@ -272,6 +274,7 @@ charset-tests-all: $(MAKE) charset-msg-start charset-tests charset-msg-end; \ else \ echo %%%%%%%%%% Inadequate locale support: skipping charset tests. ; \ + echo %%%%%%%%%% At least en_US.UTF-8, ru_RU.UTF-8 and ja_JP.UTF-8 are needed. ; \ fi charset-tests: $(LOCALE_CHARSET_TESTS) @@ -338,7 +341,7 @@ charset-msg-start: @echo "======== Starting tests that can vary based on character set or locale support ========" @echo "**************************************************************************" @echo "* Some or all of these tests may fail if you have inadequate or missing *" - @echo "* locale support At least en_US.UTF-8, ru_RU.UTF-8 and ja_JP.UTF-8 are *" + @echo "* locale support. At least en_US.UTF-8, ru_RU.UTF-8 and ja_JP.UTF-8 are *" @echo "* needed. However, if you see this message, the Makefile thinks you have *" @echo "* what you need ... *" @echo "**************************************************************************" @@ -853,6 +856,7 @@ mbstr1:: @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; \ AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ + mbstr2:: @echo $@ @echo Expect mbstr2 to fail with MinGW. @@ -916,7 +920,7 @@ profile4: profile5: @echo $@ - @-GAWK_NO_PP_RUN=1 $(AWK) --profile=ap-$@.out -f "$(srcdir)"/$@.awk > /dev/null + @GAWK_NO_PP_RUN=1 $(AWK) --profile=ap-$@.out -f "$(srcdir)"/$@.awk > /dev/null @sed 1,2d < ap-$@.out > _$@; rm ap-$@.out # @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ @-$(TESTOUTCMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ @@ -1252,7 +1256,7 @@ paramasfunc2:: negtime:: @echo $@ @TZ=GMT AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ - @AWKPATH="$(srcdir)" $(AWK) -f checknegtime.awk $@.ok _$@ && rm -f _$@ + @AWKPATH="$(srcdir)" $(AWK) -f checknegtime.awk "$(srcdir)"/$@.ok _$@ && rm -f _$@ muldimposix:: @echo $@ @@ -1261,8 +1265,17 @@ muldimposix:: watchpoint1: @echo $@ - @AWKPATH="$(srcdir)" $(AWK) -D -f $@.awk $@.in < $@.script >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ + @AWKPATH="$(srcdir)" $(AWK) -D -f $@.awk $(srcdir)/$@.in < $(srcdir)/$@.script >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ + +pty1: + @echo $@ + @echo Expect pty1 to fail with DJGPP and MinGW. + @case `uname` in \ + *[Oo][Ss]/390*) : ;; \ + *) AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ ; \ + $(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ ;; \ + esac Gt-dummy: # file Maketests, generated from Makefile.am by the Gentests program addcomma: @@ -2527,12 +2540,6 @@ procinfs: @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ -pty1: - @echo $@ - @echo Expect pty1 to fail with DJGPP and MinGW. - @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ - @-$(CMP) "$(srcdir)"/$@.ok _$@ && rm -f _$@ - regnul1: @echo $@ @AWKPATH="$(srcdir)" $(AWK) -f $@.awk >_$@ 2>&1 || echo EXIT CODE: $$? >>_$@ @@ -2735,11 +2742,11 @@ time: # Targets generated for other tests: -$(srcdir)/Maketests: $(srcdir)/Makefile.am $(srcdir)/Gentests +Maketests: $(srcdir)/Makefile.am $(srcdir)/Gentests files=`cd "$(srcdir)" && echo *.awk *.in`; \ - $(AWK) -f "$(srcdir)"/Gentests "$(srcdir)"/Makefile.am $$files > "$(srcdir)"/Maketests + $(AWK) -f "$(srcdir)"/Gentests "$(srcdir)"/Makefile.am $$files > $@ -clean: +clean-local: rm -fr _* core core.* fmtspcl.ok junk strftime.ok test1 test2 \ seq *~ readfile.ok fork.tmp.* testext.awk fts.ok readdir.ok \ mmap8k.ok profile1.ok @@ -2766,7 +2773,7 @@ diffout: diff -c "$(srcdir)"/$${base}.ok $$i ; \ fi ; \ fi ; \ - done | less + done | more # convenient way to scan valgrind results for errors valgrind-scan: -- cgit v1.2.3 From f6d6da33b2df6dc4d5a4dee4b7805937b5701d7a Mon Sep 17 00:00:00 2001 From: "Arnold D. Robbins" Date: Sun, 17 Apr 2016 05:54:32 +0300 Subject: Bump version for next tarball. --- configure | 20 ++++++++++---------- configure.ac | 2 +- pc/config.h | 12 ++++++------ 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/configure b/configure index de956a39..3b3d11c6 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for GNU Awk 4.1.3d. +# Generated by GNU Autoconf 2.69 for GNU Awk 4.1.3e. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='GNU Awk' PACKAGE_TARNAME='gawk' -PACKAGE_VERSION='4.1.3d' -PACKAGE_STRING='GNU Awk 4.1.3d' +PACKAGE_VERSION='4.1.3e' +PACKAGE_STRING='GNU Awk 4.1.3e' PACKAGE_BUGREPORT='bug-gawk@gnu.org' PACKAGE_URL='http://www.gnu.org/software/gawk/' @@ -1328,7 +1328,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures GNU Awk 4.1.3d to adapt to many kinds of systems. +\`configure' configures GNU Awk 4.1.3e to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1398,7 +1398,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of GNU Awk 4.1.3d:";; + short | recursive ) echo "Configuration of GNU Awk 4.1.3e:";; esac cat <<\_ACEOF @@ -1517,7 +1517,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -GNU Awk configure 4.1.3d +GNU Awk configure 4.1.3e generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2226,7 +2226,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by GNU Awk $as_me 4.1.3d, which was +It was created by GNU Awk $as_me 4.1.3e, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3109,7 +3109,7 @@ fi # Define the identity of the package. PACKAGE='gawk' - VERSION='4.1.3d' + VERSION='4.1.3e' cat >>confdefs.h <<_ACEOF @@ -12047,7 +12047,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by GNU Awk $as_me 4.1.3d, which was +This file was extended by GNU Awk $as_me 4.1.3e, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12115,7 +12115,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -GNU Awk config.status 4.1.3d +GNU Awk config.status 4.1.3e configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 53d93918..d9dbbda8 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ dnl dnl Process this file with autoconf to produce a configure script. -AC_INIT([GNU Awk], 4.1.3d, bug-gawk@gnu.org, gawk) +AC_INIT([GNU Awk], 4.1.3e, bug-gawk@gnu.org, gawk) # This is a hack. Different versions of install on different systems # are just too different. Chuck it and use install-sh. diff --git a/pc/config.h b/pc/config.h index 9da16867..58101f1d 100644 --- a/pc/config.h +++ b/pc/config.h @@ -27,9 +27,7 @@ #define HAVE_ATEXIT 1 /* Define to 1 if you have the `btowc' function. */ -#ifdef _WIN32 #define HAVE_BTOWC 1 -#endif /* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the CoreFoundation framework. */ @@ -328,7 +326,9 @@ #define HAVE_SYS_TYPES_H 1 /* Define to 1 if you have that is POSIX.1 compatible. */ -#undef HAVE_SYS_WAIT_H +#ifdef __DJGPP__ +#define HAVE_SYS_WAIT_H 1 +#endif /* Define to 1 if you have the header file. */ #undef HAVE_TERMIOS_H @@ -438,7 +438,7 @@ #define PACKAGE_NAME "GNU Awk" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "GNU Awk 4.1.3d" +#define PACKAGE_STRING "GNU Awk 4.1.3e" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "gawk" @@ -447,7 +447,7 @@ #define PACKAGE_URL "http://www.gnu.org/software/gawk/" /* Define to the version of this package. */ -#define PACKAGE_VERSION "4.1.3d" +#define PACKAGE_VERSION "4.1.3e" /* Define to 1 if *printf supports %F format */ #undef PRINTF_HAS_F_FORMAT @@ -512,7 +512,7 @@ /* Version number of package */ -#define VERSION "4.1.3d" +#define VERSION "4.1.3e" /* Enable large inode numbers on Mac OS X 10.5. */ #ifndef _DARWIN_USE_64_BIT_INODE -- cgit v1.2.3