[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gawk-diffs] [SCM] gawk branch, gawk-4.2-stable, updated. gawk-4.1.0-285
|
From: |
Arnold Robbins |
|
Subject: |
[gawk-diffs] [SCM] gawk branch, gawk-4.2-stable, updated. gawk-4.1.0-2855-gd2dde96 |
|
Date: |
Fri, 22 Dec 2017 07:25:37 -0500 (EST) |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "gawk".
The branch, gawk-4.2-stable has been updated
via d2dde96decab77927a04af75fd9183666c25a624 (commit)
via 67a491896e14a12f85d336864138c21c6146aea0 (commit)
from 5864e4d3bff453af474557234a573b8f1785fc8a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.sv.gnu.org/cgit/gawk.git/commit/?id=d2dde96decab77927a04af75fd9183666c25a624
commit d2dde96decab77927a04af75fd9183666c25a624
Author: Arnold D. Robbins <address@hidden>
Date: Fri Dec 22 14:25:19 2017 +0200
Update build infrastructure files.
diff --git a/ChangeLog b/ChangeLog
index 67c2252..0fb550c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2017-12-22 Arnold D. Robbins <address@hidden>
+
+ * config.guess, config.sub, depcomp, install-sh: Updated
+ from GNULIB.
+
2017-12-20 Arnold D. Robbins <address@hidden>
* configure.ac: Add --enable-versioned-dir option for a
diff --git a/config.guess b/config.guess
index ba1c143..770cb5c 100755
--- a/config.guess
+++ b/config.guess
@@ -2,7 +2,7 @@
# Attempt to guess a canonical system name.
# Copyright 1992-2017 Free Software Foundation, Inc.
-timestamp='2017-09-26'
+timestamp='2017-12-17'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -39,7 +39,7 @@ Usage: $0 [OPTION]
Output the configuration name of the system \`$me' is run on.
-Operation modes:
+Options:
-h, --help print this help, then exit
-t, --time-stamp print date of last modification, then exit
-v, --version print version number, then exit
@@ -244,6 +244,9 @@ case
"${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE}
exit ;;
+ *:MidnightBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-midnightbsd${UNAME_RELEASE}
+ exit ;;
*:ekkoBSD:*:*)
echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
exit ;;
@@ -262,6 +265,9 @@ case
"${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
*:Redox:*:*)
echo ${UNAME_MACHINE}-unknown-redox
exit ;;
+ mips:OSF1:*.*)
+ echo mips-dec-osf1
+ exit ;;
alpha:OSF1:*:*)
case $UNAME_RELEASE in
*4.0)
@@ -479,13 +485,13 @@ case
"${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
#endif
#if defined (host_mips) && defined (MIPSEB)
#if defined (SYSTYPE_SYSV)
- printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
+ printf ("mips-mips-riscos%ssysv\\n", argv[1]); exit (0);
#endif
#if defined (SYSTYPE_SVR4)
- printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
+ printf ("mips-mips-riscos%ssvr4\\n", argv[1]); exit (0);
#endif
#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
- printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
+ printf ("mips-mips-riscos%sbsd\\n", argv[1]); exit (0);
#endif
#endif
exit (-1);
@@ -608,7 +614,7 @@ EOF
*:AIX:*:*)
echo rs6000-ibm-aix
exit ;;
- ibmrt:4.4BSD:*|romp-ibm:BSD:*)
+ ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*)
echo romp-ibm-bsd4.4
exit ;;
ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and
@@ -629,8 +635,8 @@ EOF
9000/[34678]??:HP-UX:*:*)
HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
case "${UNAME_MACHINE}" in
- 9000/31? ) HP_ARCH=m68000 ;;
- 9000/[34]?? ) HP_ARCH=m68k ;;
+ 9000/31?) HP_ARCH=m68000 ;;
+ 9000/[34]??) HP_ARCH=m68k ;;
9000/[678][0-9][0-9])
if [ -x /usr/bin/getconf ]; then
sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
@@ -743,7 +749,7 @@ EOF
{ echo "$SYSTEM_NAME"; exit; }
echo unknown-hitachi-hiuxwe2
exit ;;
- 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
+ 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*)
echo hppa1.1-hp-bsd
exit ;;
9000/8??:4.3bsd:*:*)
@@ -752,7 +758,7 @@ EOF
*9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
echo hppa1.0-hp-mpeix
exit ;;
- hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
+ hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*)
echo hppa1.1-hp-osf
exit ;;
hp8??:OSF1:*:*)
@@ -1072,7 +1078,7 @@ EOF
i*86:*DOS:*:*)
echo ${UNAME_MACHINE}-pc-msdosdjgpp
exit ;;
- i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
+ i*86:*:4.*:*)
UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
diff --git a/config.sub b/config.sub
index c6950fd..00f68b8 100755
--- a/config.sub
+++ b/config.sub
@@ -2,7 +2,7 @@
# Configuration validation subroutine script.
# Copyright 1992-2017 Free Software Foundation, Inc.
-timestamp='2017-09-26'
+timestamp='2017-11-23'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -57,7 +57,7 @@ Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
Canonicalize a configuration name.
-Operation modes:
+Options:
-h, --help print this help, then exit
-t, --time-stamp print date of last modification, then exit
-v, --version print version number, then exit
@@ -313,7 +313,6 @@ case $basic_machine in
| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
| visium \
| wasm32 \
- | we32k \
| x86 | xc16x | xstormy16 | xtensa \
| z8k | z80)
basic_machine=$basic_machine-unknown
@@ -640,7 +639,7 @@ case $basic_machine in
basic_machine=rs6000-bull
os=-bosx
;;
- dpx2* | dpx2*-bull)
+ dpx2*)
basic_machine=m68k-bull
os=-sysv3
;;
@@ -902,7 +901,7 @@ case $basic_machine in
basic_machine=v70-nec
os=-sysv
;;
- next | m*-next )
+ next | m*-next)
basic_machine=m68k-next
case $os in
-nextstep* )
@@ -1492,7 +1491,7 @@ case $os in
-nova*)
os=-rtmk-nova
;;
- -ns2 )
+ -ns2)
os=-nextstep2
;;
-nsk*)
@@ -1547,6 +1546,19 @@ case $os in
-dicos*)
os=-dicos
;;
+ -pikeos*)
+ # Until real need of OS specific support for
+ # particular features comes up, bare metal
+ # configurations are quite functional.
+ case $basic_machine in
+ arm*)
+ os=-eabi
+ ;;
+ *)
+ os=-elf
+ ;;
+ esac
+ ;;
-nacl*)
;;
-ios)
@@ -1694,7 +1706,7 @@ case $basic_machine in
m88k-omron*)
os=-luna
;;
- *-next )
+ *-next)
os=-nextstep
;;
*-sequent)
diff --git a/depcomp b/depcomp
index 4527c64..5ff3c6f 100755
--- a/depcomp
+++ b/depcomp
@@ -251,6 +251,41 @@ hp)
exit 1
;;
+sgi)
+ if test "$libtool" = yes; then
+ "$@" "-Wp,-MDupdate,$tmpdepfile"
+ else
+ "$@" -MDupdate "$tmpdepfile"
+ fi
+ stat=$?
+ if test $stat -ne 0; then
+ rm -f "$tmpdepfile"
+ exit $stat
+ fi
+ rm -f "$depfile"
+
+ if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files
+ echo "$object : \\" > "$depfile"
+ # Clip off the initial element (the dependent). Don't try to be
+ # clever and replace this with sed code, as IRIX sed won't handle
+ # lines with more than a fixed number of characters (4096 in
+ # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines;
+ # the IRIX cc adds comments like '#:fec' to the end of the
+ # dependency line.
+ tr ' ' "$nl" < "$tmpdepfile" \
+ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \
+ | tr "$nl" ' ' >> "$depfile"
+ echo >> "$depfile"
+ # The second pass generates a dummy entry for each header file.
+ tr ' ' "$nl" < "$tmpdepfile" \
+ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
+ >> "$depfile"
+ else
+ make_dummy_depfile
+ fi
+ rm -f "$tmpdepfile"
+ ;;
+
xlc)
# This case exists only to let depend.m4 do its work. It works by
# looking at the text of this script. This case will never be run,
diff --git a/doc/ChangeLog b/doc/ChangeLog
index d6f061d..32ad8aa 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2017-12-22 Arnold D. Robbins <address@hidden>
+
+ * texinfo.tex: Updated.
+
2017-12-20 Arnold D. Robbins <address@hidden>
* gawktexi.in (Additional Configuration Options): Add
diff --git a/doc/texinfo.tex b/doc/texinfo.tex
index 9bd75b9..42bb983 100644
--- a/doc/texinfo.tex
+++ b/doc/texinfo.tex
@@ -3,7 +3,7 @@
% Load plain if necessary, i.e., if running under initex.
\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
%
-\def\texinfoversion{2017-09-16.10}
+\def\texinfoversion{2017-12-18.20}
%
% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -5969,24 +5969,30 @@ end
% Split the last of the double-column material.
\savemarks
\balancecolumns
- %
+ }%
+ \eject % call the \output just set
+ \ifdim\pagetotal=0pt
% Having called \balancecolumns once, we do not
% want to call it again. Therefore, reset \output to its normal
% definition right away.
\global\output = {\onepageout{\pagecontents\PAGE}}%
- }%
- \eject
- \endgroup % started in \begindoublecolumns
- \restoremarks
- % Leave the double-column material on the current page, no automatic
- % page break.
- \box\balancedcolumns
- %
- % \pagegoal was set to the doubled \vsize above, since we restarted
- % the current page. We're now back to normal single-column
- % typesetting, so reset \pagegoal to the normal \vsize.
- \global\vsize = \txipageheight %
- \pagegoal = \txipageheight %
+ %
+ \endgroup % started in \begindoublecolumns
+ \restoremarks
+ % Leave the double-column material on the current page, no automatic
+ % page break.
+ \box\balancedcolumns
+ %
+ % \pagegoal was set to the doubled \vsize above, since we restarted
+ % the current page. We're now back to normal single-column
+ % typesetting, so reset \pagegoal to the normal \vsize.
+ \global\vsize = \txipageheight %
+ \pagegoal = \txipageheight %
+ \else
+ % We had some left-over material. This might happen when \doublecolumnout
+ % is called in \balancecolumns. Try again.
+ \expandafter\enddoublecolumns
+ \fi
}
\newbox\balancedcolumns
\setbox\balancedcolumns=\vbox{shouldnt see this}%
@@ -6001,6 +6007,7 @@ end
\ifdim\dimen@<5\baselineskip
% Don't split a short final column in two.
\setbox2=\vbox{}%
+ \global\setbox\balancedcolumns=\vbox{\pagesofar}%
\else
\divide\dimen@ by 2 % target to split to
address@hidden = \dimen@
@@ -6016,15 +6023,15 @@ end
\repeat
}%
% Now the left column is in box 1, and the right column in box 3.
+ %
% Check whether the left column has come out higher than the page itself.
% (Note that we have doubled \vsize for the double columns, so
% the actual height of the page is 0.5\vsize).
\ifdim2\ht1>\vsize
- % Just split the last of the double column material roughly in half.
- \setbox2=\box0
- \setbox0 = \vsplit2 to address@hidden
- \setbox0=\vbox to address@hidden {\unvbox0\vfill}%
- \setbox2=\vbox to address@hidden {\unvbox2\vfill}%
+ % It appears that we have been called upon to balance too much material.
+ % Output some of it with \doublecolumnout, leaving the rest on the page.
+ \setbox\PAGE=\box0
+ \doublecolumnout
\else
% Compare the heights of the two columns.
\ifdim4\ht1>5\ht3
@@ -6037,10 +6044,10 @@ end
\setbox2=\vbox to\ht1{\unvbox3\unskip}%
\setbox0=\vbox to\ht1{\unvbox1\unskip}%
\fi
+ \global\setbox\balancedcolumns=\vbox{\pagesofar}%
\fi
\fi
%
- \global\setbox\balancedcolumns=\vbox{\pagesofar}%
}
\catcode`\@ = \other
@@ -11425,9 +11432,11 @@ directory should work if nowhere else does.}
%
\dimen0 = #1\relax
\advance\dimen0 by \voffset
+ \advance\dimen0 by 1in % reference point for DVI is 1 inch from top of page
%
\dimen2 = \hsize
\advance\dimen2 by \normaloffset
+ \advance\dimen2 by 1in % reference point is 1 inch from left edge of page
%
\internalpagesizes{#1}{\hsize}%
{\voffset}{\normaloffset}%
diff --git a/extension/build-aux/ChangeLog b/extension/build-aux/ChangeLog
index 918674d..eb95462 100644
--- a/extension/build-aux/ChangeLog
+++ b/extension/build-aux/ChangeLog
@@ -1,3 +1,8 @@
+2017-12-22 Arnold D. Robbins <address@hidden>
+
+ * config.guess, config.sub, depcomp, install-sh: Updated
+ from GNULIB.
+
2017-10-19 Arnold D. Robbins <address@hidden>
* 4.2.0: Release tar ball made.
diff --git a/extension/build-aux/config.guess b/extension/build-aux/config.guess
index ba1c143..770cb5c 100755
--- a/extension/build-aux/config.guess
+++ b/extension/build-aux/config.guess
@@ -2,7 +2,7 @@
# Attempt to guess a canonical system name.
# Copyright 1992-2017 Free Software Foundation, Inc.
-timestamp='2017-09-26'
+timestamp='2017-12-17'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -39,7 +39,7 @@ Usage: $0 [OPTION]
Output the configuration name of the system \`$me' is run on.
-Operation modes:
+Options:
-h, --help print this help, then exit
-t, --time-stamp print date of last modification, then exit
-v, --version print version number, then exit
@@ -244,6 +244,9 @@ case
"${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE}
exit ;;
+ *:MidnightBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-midnightbsd${UNAME_RELEASE}
+ exit ;;
*:ekkoBSD:*:*)
echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
exit ;;
@@ -262,6 +265,9 @@ case
"${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
*:Redox:*:*)
echo ${UNAME_MACHINE}-unknown-redox
exit ;;
+ mips:OSF1:*.*)
+ echo mips-dec-osf1
+ exit ;;
alpha:OSF1:*:*)
case $UNAME_RELEASE in
*4.0)
@@ -479,13 +485,13 @@ case
"${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
#endif
#if defined (host_mips) && defined (MIPSEB)
#if defined (SYSTYPE_SYSV)
- printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
+ printf ("mips-mips-riscos%ssysv\\n", argv[1]); exit (0);
#endif
#if defined (SYSTYPE_SVR4)
- printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
+ printf ("mips-mips-riscos%ssvr4\\n", argv[1]); exit (0);
#endif
#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
- printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
+ printf ("mips-mips-riscos%sbsd\\n", argv[1]); exit (0);
#endif
#endif
exit (-1);
@@ -608,7 +614,7 @@ EOF
*:AIX:*:*)
echo rs6000-ibm-aix
exit ;;
- ibmrt:4.4BSD:*|romp-ibm:BSD:*)
+ ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*)
echo romp-ibm-bsd4.4
exit ;;
ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and
@@ -629,8 +635,8 @@ EOF
9000/[34678]??:HP-UX:*:*)
HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
case "${UNAME_MACHINE}" in
- 9000/31? ) HP_ARCH=m68000 ;;
- 9000/[34]?? ) HP_ARCH=m68k ;;
+ 9000/31?) HP_ARCH=m68000 ;;
+ 9000/[34]??) HP_ARCH=m68k ;;
9000/[678][0-9][0-9])
if [ -x /usr/bin/getconf ]; then
sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
@@ -743,7 +749,7 @@ EOF
{ echo "$SYSTEM_NAME"; exit; }
echo unknown-hitachi-hiuxwe2
exit ;;
- 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
+ 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*)
echo hppa1.1-hp-bsd
exit ;;
9000/8??:4.3bsd:*:*)
@@ -752,7 +758,7 @@ EOF
*9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
echo hppa1.0-hp-mpeix
exit ;;
- hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
+ hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*)
echo hppa1.1-hp-osf
exit ;;
hp8??:OSF1:*:*)
@@ -1072,7 +1078,7 @@ EOF
i*86:*DOS:*:*)
echo ${UNAME_MACHINE}-pc-msdosdjgpp
exit ;;
- i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
+ i*86:*:4.*:*)
UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
diff --git a/extension/build-aux/config.sub b/extension/build-aux/config.sub
index c6950fd..00f68b8 100755
--- a/extension/build-aux/config.sub
+++ b/extension/build-aux/config.sub
@@ -2,7 +2,7 @@
# Configuration validation subroutine script.
# Copyright 1992-2017 Free Software Foundation, Inc.
-timestamp='2017-09-26'
+timestamp='2017-11-23'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -57,7 +57,7 @@ Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
Canonicalize a configuration name.
-Operation modes:
+Options:
-h, --help print this help, then exit
-t, --time-stamp print date of last modification, then exit
-v, --version print version number, then exit
@@ -313,7 +313,6 @@ case $basic_machine in
| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
| visium \
| wasm32 \
- | we32k \
| x86 | xc16x | xstormy16 | xtensa \
| z8k | z80)
basic_machine=$basic_machine-unknown
@@ -640,7 +639,7 @@ case $basic_machine in
basic_machine=rs6000-bull
os=-bosx
;;
- dpx2* | dpx2*-bull)
+ dpx2*)
basic_machine=m68k-bull
os=-sysv3
;;
@@ -902,7 +901,7 @@ case $basic_machine in
basic_machine=v70-nec
os=-sysv
;;
- next | m*-next )
+ next | m*-next)
basic_machine=m68k-next
case $os in
-nextstep* )
@@ -1492,7 +1491,7 @@ case $os in
-nova*)
os=-rtmk-nova
;;
- -ns2 )
+ -ns2)
os=-nextstep2
;;
-nsk*)
@@ -1547,6 +1546,19 @@ case $os in
-dicos*)
os=-dicos
;;
+ -pikeos*)
+ # Until real need of OS specific support for
+ # particular features comes up, bare metal
+ # configurations are quite functional.
+ case $basic_machine in
+ arm*)
+ os=-eabi
+ ;;
+ *)
+ os=-elf
+ ;;
+ esac
+ ;;
-nacl*)
;;
-ios)
@@ -1694,7 +1706,7 @@ case $basic_machine in
m88k-omron*)
os=-luna
;;
- *-next )
+ *-next)
os=-nextstep
;;
*-sequent)
diff --git a/extension/build-aux/depcomp b/extension/build-aux/depcomp
index 4527c64..5ff3c6f 100755
--- a/extension/build-aux/depcomp
+++ b/extension/build-aux/depcomp
@@ -251,6 +251,41 @@ hp)
exit 1
;;
+sgi)
+ if test "$libtool" = yes; then
+ "$@" "-Wp,-MDupdate,$tmpdepfile"
+ else
+ "$@" -MDupdate "$tmpdepfile"
+ fi
+ stat=$?
+ if test $stat -ne 0; then
+ rm -f "$tmpdepfile"
+ exit $stat
+ fi
+ rm -f "$depfile"
+
+ if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files
+ echo "$object : \\" > "$depfile"
+ # Clip off the initial element (the dependent). Don't try to be
+ # clever and replace this with sed code, as IRIX sed won't handle
+ # lines with more than a fixed number of characters (4096 in
+ # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines;
+ # the IRIX cc adds comments like '#:fec' to the end of the
+ # dependency line.
+ tr ' ' "$nl" < "$tmpdepfile" \
+ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \
+ | tr "$nl" ' ' >> "$depfile"
+ echo >> "$depfile"
+ # The second pass generates a dummy entry for each header file.
+ tr ' ' "$nl" < "$tmpdepfile" \
+ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
+ >> "$depfile"
+ else
+ make_dummy_depfile
+ fi
+ rm -f "$tmpdepfile"
+ ;;
+
xlc)
# This case exists only to let depend.m4 do its work. It works by
# looking at the text of this script. This case will never be run,
diff --git a/extension/build-aux/install-sh b/extension/build-aux/install-sh
index 0360b79..ac159ce 100755
--- a/extension/build-aux/install-sh
+++ b/extension/build-aux/install-sh
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=2016-01-11.22; # UTC
+scriptversion=2017-09-23.17; # UTC
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
@@ -271,15 +271,18 @@ do
fi
dst=$dst_arg
- # If destination is a directory, append the input filename; won't work
- # if double slashes aren't ignored.
+ # If destination is a directory, append the input filename.
if test -d "$dst"; then
if test "$is_target_a_directory" = never; then
echo "$0: $dst_arg: Is a directory" >&2
exit 1
fi
dstdir=$dst
- dst=$dstdir/`basename "$src"`
+ dstbase=`basename "$src"`
+ case $dst in
+ */) dst=$dst$dstbase;;
+ *) dst=$dst/$dstbase;;
+ esac
dstdir_status=0
else
dstdir=`dirname "$dst"`
@@ -288,6 +291,11 @@ do
fi
fi
+ case $dstdir in
+ */) dstdirslash=$dstdir;;
+ *) dstdirslash=$dstdir/;;
+ esac
+
obsolete_mkdir_used=false
if test $dstdir_status != 0; then
@@ -427,8 +435,8 @@ do
else
# Make a couple of temp file names in the proper directory.
- dsttmp=$dstdir/_inst.$$_
- rmtmp=$dstdir/_rm.$$_
+ dsttmp=${dstdirslash}_inst.$$_
+ rmtmp=${dstdirslash}_rm.$$_
# Trap to clean up those temp files at exit.
trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
diff --git a/install-sh b/install-sh
index 0360b79..ac159ce 100755
--- a/install-sh
+++ b/install-sh
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=2016-01-11.22; # UTC
+scriptversion=2017-09-23.17; # UTC
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
@@ -271,15 +271,18 @@ do
fi
dst=$dst_arg
- # If destination is a directory, append the input filename; won't work
- # if double slashes aren't ignored.
+ # If destination is a directory, append the input filename.
if test -d "$dst"; then
if test "$is_target_a_directory" = never; then
echo "$0: $dst_arg: Is a directory" >&2
exit 1
fi
dstdir=$dst
- dst=$dstdir/`basename "$src"`
+ dstbase=`basename "$src"`
+ case $dst in
+ */) dst=$dst$dstbase;;
+ *) dst=$dst/$dstbase;;
+ esac
dstdir_status=0
else
dstdir=`dirname "$dst"`
@@ -288,6 +291,11 @@ do
fi
fi
+ case $dstdir in
+ */) dstdirslash=$dstdir;;
+ *) dstdirslash=$dstdir/;;
+ esac
+
obsolete_mkdir_used=false
if test $dstdir_status != 0; then
@@ -427,8 +435,8 @@ do
else
# Make a couple of temp file names in the proper directory.
- dsttmp=$dstdir/_inst.$$_
- rmtmp=$dstdir/_rm.$$_
+ dsttmp=${dstdirslash}_inst.$$_
+ rmtmp=${dstdirslash}_rm.$$_
# Trap to clean up those temp files at exit.
trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
http://git.sv.gnu.org/cgit/gawk.git/commit/?id=67a491896e14a12f85d336864138c21c6146aea0
commit 67a491896e14a12f85d336864138c21c6146aea0
Author: Arnold D. Robbins <address@hidden>
Date: Fri Dec 22 11:13:31 2017 +0200
Add --enable-versioned-extension-dir configure option.
diff --git a/ChangeLog b/ChangeLog
index 84f8366..67c2252 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2017-12-20 Arnold D. Robbins <address@hidden>
+
+ * configure.ac: Add --enable-versioned-dir option for a
+ directory with API version in it to hold extensions.
+
2017-12-19 Arnold D. Robbins <address@hidden>
* configure.ac: Remove x's from `test "x$something" = "xyes"
diff --git a/configure b/configure
index 0b2b84c..1af24a5 100755
--- a/configure
+++ b/configure
@@ -660,7 +660,6 @@ MSGFMT
GETTEXT_MACRO_VERSION
USE_NLS
SED
-pkgextensiondir
acl_shlibext
RANLIB
LN_S
@@ -694,6 +693,7 @@ build_os
build_vendor
build_cpu
build
+pkgextensiondir
AM_BACKSLASH
AM_DEFAULT_VERBOSITY
AM_DEFAULT_V
@@ -768,6 +768,7 @@ enable_lint
enable_severe_portability_problems
enable_builtin_intdiv0
enable_mpfr
+enable_versioned_extension_dir
enable_dependency_tracking
enable_largefile
enable_nls
@@ -1417,6 +1418,8 @@ Optional Features:
--enable-builtin-intdiv0
enable built-in intdiv0 function
--disable-mpfr do not check for MPFR
+ --enable-versioned-extension-dir
+ use a versioned directory for extensions
--enable-dependency-tracking
do not reject slow dependency extractors
--disable-dependency-tracking
@@ -3275,6 +3278,25 @@ if test "${enable_mpfr+set}" = set; then :
fi
+EXTENSIONDIR=
+# Check whether --enable-versioned-extension-dir was given.
+if test "${enable_versioned_extension_dir+set}" = set; then :
+ enableval=$enable_versioned_extension_dir; if test "$enableval" = yes
+ then
+ MAJOR=`awk '/define gawk_api_major_version/ { print $3 }' <
$srcdir/gawkapi.h`
+ MINOR=`awk '/define gawk_api_minor_version/ { print $3 }' <
$srcdir/gawkapi.h`
+
+ # note leading slash on the value
+ export EXTENSIONDIR=/ext-$MAJOR.$MINOR
+ fi
+
+fi
+
+
+# set default shared library location
+pkgextensiondir='${pkglibdir}'${EXTENSIONDIR}
+
+
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
@@ -5436,9 +5458,6 @@ fi
# shared library suffix for dynamic loading:
-# default shared library location
-pkgextensiondir='${pkglibdir}'
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for z/OS USS compilation" >&5
diff --git a/configure.ac b/configure.ac
index 8b3434f..548379c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -88,6 +88,22 @@ AC_ARG_ENABLE([mpfr],
fi
)
+EXTENSIONDIR=
+AC_ARG_ENABLE([versioned-extension-dir],
+ [AS_HELP_STRING([--enable-versioned-extension-dir], [use a versioned
directory for extensions])],
+ if test "$enableval" = yes
+ then
+ MAJOR=`awk '/define gawk_api_major_version/ { print $3 }' <
$srcdir/gawkapi.h`
+ MINOR=`awk '/define gawk_api_minor_version/ { print $3 }' <
$srcdir/gawkapi.h`
+
+ # note leading slash on the value
+ export EXTENSIONDIR=/ext-$MAJOR.$MINOR
+ fi
+)
+
+# set default shared library location
+AC_SUBST([pkgextensiondir], ['${pkglibdir}'${EXTENSIONDIR}])
+
AC_CANONICAL_HOST
AC_USE_SYSTEM_EXTENSIONS
@@ -129,8 +145,6 @@ AC_SUBST(CFLAGS)
# shared library suffix for dynamic loading:
AC_SUBST(acl_shlibext)
-# default shared library location
-AC_SUBST([pkgextensiondir], ['${pkglibdir}'])
dnl checks for systems
AC_ZOS_USS
diff --git a/doc/ChangeLog b/doc/ChangeLog
index d73f939..d6f061d 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2017-12-20 Arnold D. Robbins <address@hidden>
+
+ * gawktexi.in (Additional Configuration Options): Add
+ description of the --enable-versioned-extension-dir option.
+
2017-12-01 Sergey Tselikh <address@hidden>
* gawktexi.in: Several small changes to gawktexi.in,
diff --git a/doc/gawk.info b/doc/gawk.info
index e93b4d3..b0b732b 100644
--- a/doc/gawk.info
+++ b/doc/gawk.info
@@ -28971,6 +28971,12 @@ command line when compiling 'gawk' from scratch,
including:
desirable, but it may bring you some slight performance
improvement.
+'--enable-versioned-extension-dir'
+ Use a versioned directory for extensions. The directory name will
+ include the major and minor API versions in it. This makes it
+ possible to keep extensions for different API versions on the same
+ system without their conflicting with one another.
+
'--with-whiny-user-strftime'
Force use of the included version of the C 'strftime()' function
for deficient systems.
@@ -32878,6 +32884,8 @@ Index
* --dump-variables option: Options. (line 94)
* --dump-variables option, using for library functions: Library Names.
(line 45)
+* --enable-versioned-extension-dir configuration option: Additional
Configuration Options.
+ (line 42)
* --exec option: Options. (line 139)
* --field-separator option: Options. (line 21)
* --file option: Options. (line 25)
@@ -32914,7 +32922,7 @@ Index
* --use-lc-numeric option: Options. (line 232)
* --version option: Options. (line 318)
* --with-whiny-user-strftime configuration option: Additional Configuration
Options.
- (line 42)
+ (line 48)
* -b option: Options. (line 69)
* -c option: Options. (line 82)
* -C option: Options. (line 89)
@@ -33619,8 +33627,10 @@ Index
(line 32)
* configuration option, --disable-nls: Additional Configuration Options.
(line 37)
-* configuration option, --with-whiny-user-strftime: Additional Configuration
Options.
+* configuration option, --enable-versioned-extension-dir: Additional
Configuration Options.
(line 42)
+* configuration option, --with-whiny-user-strftime: Additional Configuration
Options.
+ (line 48)
* configuration options, gawk: Additional Configuration Options.
(line 6)
* constant regexps: Regexp Usage. (line 57)
@@ -36459,58 +36469,58 @@ Node: Unix Installation1163323
Node: Quick Installation1164005
Node: Shell Startup Files1166419
Node: Additional Configuration Options1167508
-Node: Configuration Philosophy1169497
-Node: Non-Unix Installation1171866
-Node: PC Installation1172326
-Node: PC Binary Installation1173164
-Node: PC Compiling1173599
-Node: PC Using1174716
-Node: Cygwin1177761
-Node: MSYS1178531
-Node: VMS Installation1179032
-Node: VMS Compilation1179823
-Ref: VMS Compilation-Footnote-11181052
-Node: VMS Dynamic Extensions1181110
-Node: VMS Installation Details1182795
-Node: VMS Running1185048
-Node: VMS GNV1189327
-Node: VMS Old Gawk1190062
-Node: Bugs1190533
-Node: Bug address1191196
-Node: Usenet1193988
-Node: Maintainers1194765
-Node: Other Versions1196026
-Node: Installation summary1202788
-Node: Notes1203990
-Node: Compatibility Mode1204855
-Node: Additions1205637
-Node: Accessing The Source1206562
-Node: Adding Code1207999
-Node: New Ports1214218
-Node: Derived Files1218706
-Ref: Derived Files-Footnote-11224352
-Ref: Derived Files-Footnote-21224387
-Ref: Derived Files-Footnote-31224985
-Node: Future Extensions1225099
-Node: Implementation Limitations1225757
-Node: Extension Design1226940
-Node: Old Extension Problems1228094
-Ref: Old Extension Problems-Footnote-11229612
-Node: Extension New Mechanism Goals1229669
-Ref: Extension New Mechanism Goals-Footnote-11233033
-Node: Extension Other Design Decisions1233222
-Node: Extension Future Growth1235335
-Node: Old Extension Mechanism1236171
-Node: Notes summary1237934
-Node: Basic Concepts1239116
-Node: Basic High Level1239797
-Ref: figure-general-flow1240079
-Ref: figure-process-flow1240764
-Ref: Basic High Level-Footnote-11244065
-Node: Basic Data Typing1244250
-Node: Glossary1247578
-Node: Copying1279416
-Node: GNU Free Documentation License1316955
-Node: Index1342073
+Node: Configuration Philosophy1169801
+Node: Non-Unix Installation1172170
+Node: PC Installation1172630
+Node: PC Binary Installation1173468
+Node: PC Compiling1173903
+Node: PC Using1175020
+Node: Cygwin1178065
+Node: MSYS1178835
+Node: VMS Installation1179336
+Node: VMS Compilation1180127
+Ref: VMS Compilation-Footnote-11181356
+Node: VMS Dynamic Extensions1181414
+Node: VMS Installation Details1183099
+Node: VMS Running1185352
+Node: VMS GNV1189631
+Node: VMS Old Gawk1190366
+Node: Bugs1190837
+Node: Bug address1191500
+Node: Usenet1194292
+Node: Maintainers1195069
+Node: Other Versions1196330
+Node: Installation summary1203092
+Node: Notes1204294
+Node: Compatibility Mode1205159
+Node: Additions1205941
+Node: Accessing The Source1206866
+Node: Adding Code1208303
+Node: New Ports1214522
+Node: Derived Files1219010
+Ref: Derived Files-Footnote-11224656
+Ref: Derived Files-Footnote-21224691
+Ref: Derived Files-Footnote-31225289
+Node: Future Extensions1225403
+Node: Implementation Limitations1226061
+Node: Extension Design1227244
+Node: Old Extension Problems1228398
+Ref: Old Extension Problems-Footnote-11229916
+Node: Extension New Mechanism Goals1229973
+Ref: Extension New Mechanism Goals-Footnote-11233337
+Node: Extension Other Design Decisions1233526
+Node: Extension Future Growth1235639
+Node: Old Extension Mechanism1236475
+Node: Notes summary1238238
+Node: Basic Concepts1239420
+Node: Basic High Level1240101
+Ref: figure-general-flow1240383
+Ref: figure-process-flow1241068
+Ref: Basic High Level-Footnote-11244369
+Node: Basic Data Typing1244554
+Node: Glossary1247882
+Node: Copying1279720
+Node: GNU Free Documentation License1317259
+Node: Index1342377
End Tag Table
diff --git a/doc/gawk.texi b/doc/gawk.texi
index 781f157..cc32cb8 100644
--- a/doc/gawk.texi
+++ b/doc/gawk.texi
@@ -39552,6 +39552,14 @@ Disable all message-translation facilities.
This is usually not desirable, but it may bring you some slight performance
improvement.
address@hidden @option{--enable-versioned-extension-dir} configuration option
address@hidden configuration option, @code{--enable-versioned-extension-dir}
address@hidden --enable-versioned-extension-dir
+Use a versioned directory for extensions. The directory name will
+include the major and minor API versions in it. This makes it possible
+to keep extensions for different API versions on the same system
+without their conflicting with one another.
+
@cindex @option{--with-whiny-user-strftime} configuration option
@cindex configuration option, @code{--with-whiny-user-strftime}
@item --with-whiny-user-strftime
diff --git a/doc/gawktexi.in b/doc/gawktexi.in
index 7596bd9..20321ad 100644
--- a/doc/gawktexi.in
+++ b/doc/gawktexi.in
@@ -38565,6 +38565,14 @@ Disable all message-translation facilities.
This is usually not desirable, but it may bring you some slight performance
improvement.
address@hidden @option{--enable-versioned-extension-dir} configuration option
address@hidden configuration option, @code{--enable-versioned-extension-dir}
address@hidden --enable-versioned-extension-dir
+Use a versioned directory for extensions. The directory name will
+include the major and minor API versions in it. This makes it possible
+to keep extensions for different API versions on the same system
+without their conflicting with one another.
+
@cindex @option{--with-whiny-user-strftime} configuration option
@cindex configuration option, @code{--with-whiny-user-strftime}
@item --with-whiny-user-strftime
diff --git a/extension/ChangeLog b/extension/ChangeLog
index 830c656..f788401 100644
--- a/extension/ChangeLog
+++ b/extension/ChangeLog
@@ -1,3 +1,8 @@
+2017-12-20 Arnold D. Robbins <address@hidden>
+
+ * configure.ac: Add support for the --enable-versioned-dir option
+ in the main configure program.
+
2017-12-19 Arnold D. Robbins <address@hidden>
* configure.ac: Add --disable-mpfr to be in sync with main
diff --git a/extension/configure b/extension/configure
index e5fd475..3666df2 100755
--- a/extension/configure
+++ b/extension/configure
@@ -12595,7 +12595,7 @@ CC=$lt_save_CC
-pkgextensiondir='${libdir}/gawk'
+pkgextensiondir='${pkglibdir}'${EXTENSIONDIR}
if test "$GCC" = yes
diff --git a/extension/configure.ac b/extension/configure.ac
index 69461d2..e143825 100644
--- a/extension/configure.ac
+++ b/extension/configure.ac
@@ -54,7 +54,9 @@ AC_DISABLE_STATIC
LT_INIT
dnl AC_PROG_INSTALL
-AC_SUBST([pkgextensiondir], ['${libdir}/gawk'])
+dnl use the same definition as the main configure script.
+dnl EXTENSIONDIR is exported if it was set there.
+AC_SUBST([pkgextensiondir], ['${pkglibdir}'${EXTENSIONDIR}])
if test "$GCC" = yes
then
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 10 ++++
config.guess | 28 +++++----
config.sub | 26 ++++++---
configure | 27 +++++++--
configure.ac | 18 +++++-
depcomp | 35 ++++++++++++
doc/ChangeLog | 9 +++
doc/gawk.info | 120 +++++++++++++++++++++------------------
doc/gawk.texi | 8 +++
doc/gawktexi.in | 8 +++
doc/texinfo.tex | 51 ++++++++++-------
extension/ChangeLog | 5 ++
extension/build-aux/ChangeLog | 5 ++
extension/build-aux/config.guess | 28 +++++----
extension/build-aux/config.sub | 26 ++++++---
extension/build-aux/depcomp | 35 ++++++++++++
extension/build-aux/install-sh | 20 +++++--
extension/configure | 2 +-
extension/configure.ac | 4 +-
install-sh | 20 +++++--
20 files changed, 353 insertions(+), 132 deletions(-)
hooks/post-receive
--
gawk
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [gawk-diffs] [SCM] gawk branch, gawk-4.2-stable, updated. gawk-4.1.0-2855-gd2dde96,
Arnold Robbins <=