Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-09 04:13:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

gnulib: update

Browse Source 
* bootstrap, build-aux/.gitignore, gnulib, m4/.gitignore: update.
This commit is contained in:
Akim Demaille
2012-07-06 15:03:27 +02:00
parent a59a6ddef4
commit 41c11ce484
4 changed files with 71 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

111
bootstrap
View File

@@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# Print a version string. # Print a version string.
scriptversion=2012-07-03.20; # UTC scriptversion=2012-07-10.09; # UTC
# Bootstrap this package from checked-out sources. # Bootstrap this package from checked-out sources.
@@ -77,6 +77,33 @@ Running without arguments will suffice in most cases.
EOF EOF
} }
# warnf_ FORMAT-STRING ARG1...
warnf_ ()
{
warnf_format_=$1
shift
nl='
'
case $* in
*$nl*) me_=$(printf "$me"|tr "$nl|" '??')
printf "$warnf_format_" "$@" | sed "s|^|$me_: |" ;;
*) printf "$me: $warnf_format_" "$@" ;;
esac >&2
}
# warn_ WORD1...
warn_ ()
{
# If IFS does not start with ' ', set it and emit the warning in a subshell.
case $IFS in
' '*) warnf_ '%s\n' "$*";;
*) (IFS=' '; warn_ "$@");;
esac
}
# die WORD1...
die() { warn_ "$@"; exit 1; }
# Configuration. # Configuration.
# Name of the Makefile.am # Name of the Makefile.am
@@ -130,7 +157,8 @@ extract_package_name='
p p
} }
' '
package=$(sed -n "$extract_package_name" configure.ac) || exit package=$(sed -n "$extract_package_name" configure.ac) \
|| die 'cannot find package name in configure.ac'
gnulib_name=lib$package gnulib_name=lib$package
build_aux=build-aux build_aux=build-aux
@@ -203,14 +231,10 @@ find_tool ()
else else
find_tool_error_prefix="\$$find_tool_envvar: " find_tool_error_prefix="\$$find_tool_envvar: "
fi fi
if test x"$find_tool_res" = x; then test x"$find_tool_res" != x \
echo >&2 "$me: one of these is required: $find_tool_names" || die "one of these is required: $find_tool_names"
exit 1 ($find_tool_res --version </dev/null) >/dev/null 2>&1 \
fi || die "${find_tool_error_prefix}cannot run $find_tool_res --version"
($find_tool_res --version </dev/null) >/dev/null 2>&1 || {
echo >&2 "$me: ${find_tool_error_prefix}cannot run $find_tool_res --version"
exit 1
}
eval "$find_tool_envvar=\$find_tool_res" eval "$find_tool_envvar=\$find_tool_res"
eval "export $find_tool_envvar" eval "export $find_tool_envvar"
} }
@@ -269,21 +293,15 @@ do
--no-git) --no-git)
use_git=false;; use_git=false;;
*) *)
echo >&2 "$0: $option: unknown option" die "$option: unknown option";;
exit 1;;
esac esac
done done
if $use_git || test -d "$GNULIB_SRCDIR"; then $use_git || test -d "$GNULIB_SRCDIR" \
: || die "Error: --no-git requires --gnulib-srcdir"
else
echo "$0: Error: --no-git requires --gnulib-srcdir" >&2
exit 1
fi
if test -n "$checkout_only_file" && test ! -r "$checkout_only_file"; then if test -n "$checkout_only_file" && test ! -r "$checkout_only_file"; then
echo "$0: Bootstrapping from a non-checked-out distribution is risky." >&2 die "Bootstrapping from a non-checked-out distribution is risky."
exit 1
fi fi
# Ensure that lines starting with ! sort last, per gitignore conventions # Ensure that lines starting with ! sort last, per gitignore conventions
@@ -309,7 +327,7 @@ insert_sorted_if_absent() {
echo "$str" | sort_patterns - $file | cmp -s - $file > /dev/null \ echo "$str" | sort_patterns - $file | cmp -s - $file > /dev/null \
|| { echo "$str" | sort_patterns - $file > $file.bak \ || { echo "$str" | sort_patterns - $file > $file.bak \
&& mv $file.bak $file; } \ && mv $file.bak $file; } \
|| exit 1 || die "insert_sorted_if_absent $file $str: failed"
} }
# Adjust $PATTERN for $VC_IGNORE_FILE and insert it with # Adjust $PATTERN for $VC_IGNORE_FILE and insert it with
@@ -333,11 +351,8 @@ grep '^[ ]*AC_CONFIG_AUX_DIR(\['"$build_aux"'\])' configure.ac \
>/dev/null && found_aux_dir=yes >/dev/null && found_aux_dir=yes
grep '^[ ]*AC_CONFIG_AUX_DIR('"$build_aux"')' configure.ac \ grep '^[ ]*AC_CONFIG_AUX_DIR('"$build_aux"')' configure.ac \
>/dev/null && found_aux_dir=yes >/dev/null && found_aux_dir=yes
if test $found_aux_dir = no; then test $found_aux_dir = yes \
echo "$0: expected line not found in configure.ac. Add the following:" >&2 || die "configure.ac lacks 'AC_CONFIG_AUX_DIR([$build_aux])'; add it"
echo " AC_CONFIG_AUX_DIR([$build_aux])" >&2
exit 1
fi
# If $build_aux doesn't exist, create it now, otherwise some bits # If $build_aux doesn't exist, create it now, otherwise some bits
# below will malfunction. If creating it, also mark it as ignored. # below will malfunction. If creating it, also mark it as ignored.
@@ -443,7 +458,7 @@ check_versions() {
automake-ng|aclocal-ng) automake-ng|aclocal-ng)
app=${app%-ng} app=${app%-ng}
($app --version | grep '(GNU automake-ng)') >/dev/null 2>&1 || { ($app --version | grep '(GNU automake-ng)') >/dev/null 2>&1 || {
echo "$me: Error: '$app' not found or not from Automake-NG" >&2 warn_ "Error: '$app' not found or not from Automake-NG"
ret=1 ret=1
continue continue
} ;; } ;;
@@ -453,20 +468,21 @@ check_versions() {
# so we have to rely on $? rather than get_version. # so we have to rely on $? rather than get_version.
$app --version >/dev/null 2>&1 $app --version >/dev/null 2>&1
if [ 126 -le $? ]; then if [ 126 -le $? ]; then
echo "$me: Error: '$app' not found" >&2 warn_ "Error: '$app' not found"
ret=1 ret=1
fi fi
else else
# Require app to produce a new enough version string. # Require app to produce a new enough version string.
inst_ver=$(get_version $app) inst_ver=$(get_version $app)
if [ ! "$inst_ver" ]; then if [ ! "$inst_ver" ]; then
echo "$me: Error: '$app' not found" >&2 warn_ "Error: '$app' not found"
ret=1 ret=1
else else
latest_ver=$(sort_ver $req_ver $inst_ver | cut -d' ' -f2) latest_ver=$(sort_ver $req_ver $inst_ver | cut -d' ' -f2)
if [ ! "$latest_ver" = "$inst_ver" ]; then if [ ! "$latest_ver" = "$inst_ver" ]; then
echo "$me: Error: '$app' version == $inst_ver is too old" >&2 warnf_ '%s\n' \
echo " '$app' version >= $req_ver is required" >&2 "Error: '$app' version == $inst_ver is too old" \
" '$app' version >= $req_ver is required"
ret=1 ret=1
fi fi
fi fi
@@ -523,11 +539,10 @@ fi
if ! printf "$buildreq" | check_versions; then if ! printf "$buildreq" | check_versions; then
echo >&2 echo >&2
if test -f README-prereq; then if test -f README-prereq; then
echo "$0: See README-prereq for how to get the prerequisite programs" >&2 die "See README-prereq for how to get the prerequisite programs"
else else
echo "$0: Please install the prerequisite programs" >&2 die "Please install the prerequisite programs"
fi fi
exit 1
fi fi
echo "$0: Bootstrapping from checked-out $package sources..." echo "$0: Bootstrapping from checked-out $package sources..."
@@ -738,11 +753,10 @@ symlink_to_dir()
*) *)
case /$dst/ in case /$dst/ in
*//* | */../* | */./* | /*/*/*/*/*/) *//* | */../* | */./* | /*/*/*/*/*/)
echo >&2 "$me: invalid symlink calculation: $src -> $dst" die "invalid symlink calculation: $src -> $dst";;
exit 1;; /*/*/*/*/) dot_dots=../../../;;
/*/*/*/*/) dot_dots=../../../;; /*/*/*/) dot_dots=../../;;
/*/*/*/) dot_dots=../../;; /*/*/) dot_dots=../;;
/*/*/) dot_dots=../;;
esac;; esac;;
esac esac
@@ -764,7 +778,7 @@ version_controlled_file() {
grep -F "/${file##*/}/" "$parent/CVS/Entries" 2>/dev/null | grep -F "/${file##*/}/" "$parent/CVS/Entries" 2>/dev/null |
grep '^/[^/]*/[0-9]' > /dev/null grep '^/[^/]*/[0-9]' > /dev/null
else else
echo "$me: no version control for $file?" >&2 warn_ "no version control for $file?"
false false
fi fi
} }
@@ -855,11 +869,11 @@ $gnulib_tool $gnulib_tool_options --import $gnulib_modules &&
for file in $gnulib_files; do for file in $gnulib_files; do
symlink_to_dir "$GNULIB_SRCDIR" $file \ symlink_to_dir "$GNULIB_SRCDIR" $file \
|| { echo "$0: failed to symlink $file" 1>&2; exit 1; } || die "failed to symlink $file"
done done
bootstrap_post_import_hook \ bootstrap_post_import_hook \
|| { echo >&2 "$me: bootstrap_post_import_hook failed"; exit 1; } || die "bootstrap_post_import_hook failed"
# Remove any dangling symlink matching "*.m4" or "*.[ch]" in some # Remove any dangling symlink matching "*.m4" or "*.[ch]" in some
# gnulib-populated directories. Such .m4 files would cause aclocal to fail. # gnulib-populated directories. Such .m4 files would cause aclocal to fail.
@@ -887,7 +901,7 @@ echo "running: AUTOPOINT=true LIBTOOLIZE=true " \
"$AUTORECONF --verbose --install $no_recursive -I $m4_base $ACLOCAL_FLAGS" "$AUTORECONF --verbose --install $no_recursive -I $m4_base $ACLOCAL_FLAGS"
AUTOPOINT=true LIBTOOLIZE=true \ AUTOPOINT=true LIBTOOLIZE=true \
$AUTORECONF --verbose --install $no_recursive -I $m4_base $ACLOCAL_FLAGS \ $AUTORECONF --verbose --install $no_recursive -I $m4_base $ACLOCAL_FLAGS \
|| exit 1 || die "autoreconf failed"
# Get some extra files from gnulib, overriding existing files. # Get some extra files from gnulib, overriding existing files.
for file in $gnulib_extra_files; do for file in $gnulib_extra_files; do
@@ -897,7 +911,7 @@ for file in $gnulib_extra_files; do
*) dst=$file;; *) dst=$file;;
esac esac
symlink_to_dir "$GNULIB_SRCDIR" $file $dst \ symlink_to_dir "$GNULIB_SRCDIR" $file $dst \
|| { echo "$0: failed to symlink $file" 1>&2; exit 1; } || die "failed to symlink $file"
done done
if test $with_gettext = yes; then if test $with_gettext = yes; then
@@ -913,7 +927,8 @@ if test $with_gettext = yes; then
a\ a\
'"$XGETTEXT_OPTIONS"' $${end_of_xgettext_options+} '"$XGETTEXT_OPTIONS"' $${end_of_xgettext_options+}
} }
' po/Makevars.template >po/Makevars || exit 1 ' po/Makevars.template >po/Makevars \
|| die 'cannot generate po/Makevars'
# If the 'gettext' module is in use, grab the latest Makefile.in.in. # If the 'gettext' module is in use, grab the latest Makefile.in.in.
# If only the 'gettext-h' module is in use, assume autopoint already # If only the 'gettext-h' module is in use, assume autopoint already
@@ -921,7 +936,8 @@ if test $with_gettext = yes; then
case $gnulib_modules in case $gnulib_modules in
*gettext-h*) ;; *gettext-h*) ;;
*gettext*) *gettext*)
cp $GNULIB_SRCDIR/build-aux/po/Makefile.in.in po/Makefile.in.in || exit 1 cp $GNULIB_SRCDIR/build-aux/po/Makefile.in.in po/Makefile.in.in \
|| die "cannot create po/Makefile.in.in"
;; ;;
esac esac
@@ -937,7 +953,8 @@ if test $with_gettext = yes; then
a\ a\
'"$XGETTEXT_OPTIONS_RUNTIME"' $${end_of_xgettext_options+} '"$XGETTEXT_OPTIONS_RUNTIME"' $${end_of_xgettext_options+}
} }
' po/Makevars.template >runtime-po/Makevars || exit 1 ' po/Makevars.template >runtime-po/Makevars \
|| die 'cannot generate runtime-po/Makevars'
# Copy identical files from po to runtime-po. # Copy identical files from po to runtime-po.
(cd po && cp -p Makefile.in.in *-quot *.header *.sed *.sin ../runtime-po) (cd po && cp -p Makefile.in.in *-quot *.header *.sed *.sin ../runtime-po)

6
build-aux/.gitignore vendored
View File

@@ -8,9 +8,12 @@
/config.rpath /config.rpath
/config.sub /config.sub
/depcomp /depcomp
/do-release-commit-and-tag
/gendocs.sh /gendocs.sh
/git-version-gen /git-version-gen
/gitlog-to-changelog /gitlog-to-changelog
/gnu-web-doc-update
/gnupload
/install-sh /install-sh
/javacomp.sh.in /javacomp.sh.in
/javaexec.sh.in /javaexec.sh.in
@@ -23,6 +26,3 @@
/vc-list-files /vc-list-files
/warn-on-use.h /warn-on-use.h
/ylwrap /ylwrap
/do-release-commit-and-tag
/gnu-web-doc-update
/gnupload

2
gnulib

Submodule gnulib updated: be2b039116...4df9d15548

6
m4/.gitignore vendored
View File

@@ -34,6 +34,7 @@
/fprintf-posix.m4 /fprintf-posix.m4
/frexp.m4 /frexp.m4
/frexpl.m4 /frexpl.m4
/fseterr.m4
/fstat.m4 /fstat.m4
/getdtablesize.m4 /getdtablesize.m4
/getopt.m4 /getopt.m4
@@ -95,6 +96,7 @@
/multiarch.m4 /multiarch.m4
/nls.m4 /nls.m4
/nocrash.m4 /nocrash.m4
/off_t.m4
/open.m4 /open.m4
/pathmax.m4 /pathmax.m4
/perror.m4 /perror.m4
@@ -150,6 +152,7 @@
/sys_ioctl_h.m4 /sys_ioctl_h.m4
/sys_socket_h.m4 /sys_socket_h.m4
/sys_stat_h.m4 /sys_stat_h.m4
/sys_types_h.m4
/sys_wait_h.m4 /sys_wait_h.m4
/sysexits.m4 /sysexits.m4
/threadlib.m4 /threadlib.m4
@@ -176,6 +179,3 @@
/xalloc.m4 /xalloc.m4
/xsize.m4 /xsize.m4
/xstrndup.m4 /xstrndup.m4
/off_t.m4
/sys_types_h.m4
/fseterr.m4