[PATCH] build: update gnulib submodule; also bootstrap to latest (original) (raw)

Notes tests/init.sh is still in sync with gnulib

bootstrap | 166 ++++++++++++++++++++++++++++++++++--------------------------- gnulib | 2 +- 2 files changed, 94 insertions(+), 74 deletions(-)

diff --git a/bootstrap b/bootstrap index 61a9cbd..bee7765 100755 --- a/bootstrap +++ b/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh # Print a version string. -scriptversion=2012-07-03.20; # UTC +scriptversion=2013-01-20.16; # UTC # Bootstrap this package from checked-out sources. @@ -77,6 +77,33 @@ Running without arguments will suffice in most cases. 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: warnfformat""warnf_format_" "warnfformat""@" ;; + 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. # Name of the Makefile.am @@ -130,7 +157,8 @@ extract_package_name=' 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 build_aux=build-aux @@ -186,6 +214,8 @@ use_git=true # otherwise find the first of the NAMES that can be run (i.e., # supports --version). If found, set ENVVAR to the program name, # die otherwise. +# +# FIXME: code duplication, see also gnu-web-doc-update. find_tool () { find_tool_envvar=$1 @@ -203,14 +233,10 @@ find_tool () else find_tool_error_prefix="$$find_tool_envvar: " fi - if test x"$find_tool_res" = x; then - echo >&2 "$me: one of these is required: $find_tool_names" - exit 1 - fi - ($find_tool_res --version </dev/null) >/dev/null 2>&1 || { - echo >&2 "$me: findtoolerrorprefixcannotrun{find_tool_error_prefix}cannot run findtoolerrorprefixcannotrunfind_tool_res --version" - exit 1 - } + test x"$find_tool_res" != x
+ || die "one of these is required: $find_tool_names" + ($find_tool_res --version </dev/null) >/dev/null 2>&1
+ || die "${find_tool_error_prefix}cannot run $find_tool_res --version" eval "$find_tool_envvar=$find_tool_res" eval "export $find_tool_envvar" } @@ -269,51 +295,45 @@ do --no-git) use_git=false;; ) - echo >&2 "$0: $option: unknown option" - exit 1;; + die "$option: unknown option";; esac done -if usegit∣∣test−d"use_git || test -d "usegit∣∣test−d"GNULIB_SRCDIR"; then - : -else - echo "$0: Error: --no-git requires --gnulib-srcdir" >&2 - exit 1 -fi +$use_git || test -d "$GNULIB_SRCDIR"
+ || die "Error: --no-git requires --gnulib-srcdir" if test -n "$checkout_only_file" && test ! -r "$checkout_only_file"; then - echo "$0: Bootstrapping from a non-checked-out distribution is risky." >&2 - exit 1 + die "Bootstrapping from a non-checked-out distribution is risky." fi -# Ensure that lines starting with ! sort last, per gitignore conventions -# for whitelisting exceptions after a more generic blacklist pattern. -sort_patterns() { - sort -u "$@" | sed '/^!/ { - H - d - } - $ { - P - x - s/^\n// - }' | sed '/^$/d' +# Strip blank and comment lines to leave significant entries. +gitignore_entries() { + sed '/^#/d; /^$/d' "$@" } -# If STRisnotalreadyonalinebyitselfinSTR is not already on a line by itself in STRisnotalreadyonalinebyitselfinFILE, insert it, -# sorting the new contents of the file and replacing $FILE with the result. -insert_sorted_if_absent() { +# If STRisnotalreadyonalinebyitselfinSTR is not already on a line by itself in STRisnotalreadyonalinebyitselfinFILE, insert it at the start. +# Entries are inserted at the start of the ignore list to ensure existing +# entries starting with ! are not overridden. Such entries support +# whitelisting exceptions after a more generic blacklist pattern. +insert_if_absent() { file=$1 str=$2 test -f file∣∣touchfile || touch file∣∣touchfile - echo "$str" | sort_patterns - file∣cmp−s−file | cmp -s - file∣cmp−s−file > /dev/null
- || { echo "$str" | sort_patterns - file>file > file>file.bak
- && mv file.bakfile.bak file.bakfile; }
- || exit 1 + test -r file∣∣die"Error:failedtoreadignorefile:file || die "Error: failed to read ignore file: file∣∣die"Error:failedtoreadignorefile:file" + duplicate_entries=$(gitignore_entries $file | sort | uniq -d) + if [ "$duplicate_entries" ] ; then + die "Error: Duplicate entries in file:"file: " file:"duplicate_entries + fi + linesold=$(gitignore_entries $file | wc -l) + linesnew=$(echo "$str" | gitignore_entries - $file | sort -u | wc -l) + if [ linesold!=linesold != linesold!=linesnew ] ; then + { echo "$str" | cat - file>file > file>file.bak && mv file.bakfile.bak file.bakfile; }
+ || die "insert_if_absent filefile filestr: failed" + fi } # Adjust PATTERNforPATTERN for PATTERNforVC_IGNORE_FILE and insert it with -# insert_sorted_if_absent. +# insert_if_absent. insert_vc_ignore() { vc_ignore_file="$1" pattern="$2" @@ -324,7 +344,7 @@ insert_vc_ignore() { # .gitignore entry. pattern=$(echo "$pattern" | sed s,^,/,);; esac - insert_sorted_if_absent "$vc_ignore_file" "$pattern" + insert_if_absent "$vc_ignore_file" "$pattern" } # Die if there is no AC_CONFIG_AUX_DIR($build_aux) line in configure.ac. @@ -333,11 +353,8 @@ grep '^[ ]AC_CONFIG_AUX_DIR(['"$build_aux"'])' configure.ac
>/dev/null && found_aux_dir=yes grep '^[ ]AC_CONFIG_AUX_DIR('"$build_aux"')' configure.ac
>/dev/null && found_aux_dir=yes -if test $found_aux_dir = no; then - echo "$0: expected line not found in configure.ac. Add the following:" >&2 - echo " AC_CONFIG_AUX_DIR([$build_aux])" >&2 - exit 1 -fi +test $found_aux_dir = yes
+ || die "configure.ac lacks 'AC_CONFIG_AUX_DIR([$build_aux])'; add it" # If $build_aux doesn't exist, create it now, otherwise some bits # below will malfunction. If creating it, also mark it as ignored. @@ -443,7 +460,7 @@ check_versions() { automake-ng|aclocal-ng) app=${app%-ng} ($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 continue } ;; @@ -453,20 +470,21 @@ check_versions() { # so we have to rely on $? rather than get_version. $app --version >/dev/null 2>&1 if [ 126 -le $? ]; then - echo "$me: Error: '$app' not found" >&2 + warn_ "Error: '$app' not found" ret=1 fi else # Require app to produce a new enough version string. inst_ver=$(get_version $app) if [ ! "$inst_ver" ]; then - echo "$me: Error: '$app' not found" >&2 + warn_ "Error: '$app' not found" ret=1 else latest_ver=$(sort_ver reqverreq_ver reqverinst_ver | cut -d' ' -f2) if [ ! "$latest_ver" = "$inst_ver" ]; then - echo "$me: Error: '$app' version == $inst_ver is too old" >&2 - echo " '$app' version >= $req_ver is required" >&2 + warnf_ '%s\n'
+ "Error: '$app' version == $inst_ver is too old"
+ " '$app' version >= $req_ver is required" ret=1 fi fi @@ -523,11 +541,10 @@ fi if ! printf "$buildreq" | check_versions; then echo >&2 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 - echo "$0: Please install the prerequisite programs" >&2 + die "Please install the prerequisite programs" fi - exit 1 fi echo "$0: Bootstrapping from checked-out $package sources..." @@ -738,11 +755,10 @@ symlink_to_dir() ) case /$dst/ in // | /../* | /./ | //////) - echo >&2 "$me: invalid symlink calculation: src−>src -> src−>dst" - exit 1;; - /////) dot_dots=../../../;; - ////) dot_dots=../../;; - ///) dot_dots=../;; + die "invalid symlink calculation: src−>src -> src−>dst";; + /////) dot_dots=../../../;; + ////) dot_dots=../../;; + ///) dot_dots=../;; esac;; esac @@ -764,7 +780,7 @@ version_controlled_file() { grep -F "/${file##/}/" "$parent/CVS/Entries" 2>/dev/null | grep '^/[^/]/[0-9]' > /dev/null else - echo "$me: no version control for $file?" >&2 + warn_ "no version control for $file?" false fi } @@ -855,11 +871,11 @@ gnulibtoolgnulib_tool gnulibtoolgnulib_tool_options --import $gnulib_modules && for file in $gnulib_files; do symlink_to_dir "$GNULIB_SRCDIR" $file
- || { echo "$0: failed to symlink $file" 1>&2; exit 1; } + || die "failed to symlink $file" done 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 # gnulib-populated directories. Such .m4 files would cause aclocal to fail. @@ -873,21 +889,22 @@ find "$m4_base" "$source_base"
-depth ( -name '.m4' -o -name '.[ch]' )
-type l -xtype l -delete > /dev/null 2>&1 +# Invoke autoreconf with --force --install to ensure upgrades of tools +# such as ylwrap. +AUTORECONFFLAGS="--verbose --install --force -I m4basem4_base m4baseACLOCAL_FLAGS" + # Some systems (RHEL 5) are using ancient autotools, for which the # --no-recursive option had not been invented. Detect that lack and # omit the option when it's not supported. FIXME in 2017: remove this # hack when RHEL 5 autotools are updated, or when they become irrelevant. -no_recursive= case (((AUTORECONF --help) in - --no-recursive) no_recursive=--no-recursive;; + --no-recursive) AUTORECONFFLAGS="$AUTORECONFFLAGS --no-recursive";; esac # Tell autoreconf not to invoke autopoint or libtoolize; they were run above. -echo "running: AUTOPOINT=true LIBTOOLIZE=true "
- "$AUTORECONF --verbose --install norecursive−Ino_recursive -I norecursive−Im4_base $ACLOCAL_FLAGS" -AUTOPOINT=true LIBTOOLIZE=true
- AUTORECONF−−verbose−−installAUTORECONF --verbose --install AUTORECONF−−verbose−−installno_recursive -I m4basem4_base m4baseACLOCAL_FLAGS
- || exit 1 +echo "running: AUTOPOINT=true LIBTOOLIZE=true AUTORECONFAUTORECONF AUTORECONFAUTORECONFFLAGS" +AUTOPOINT=true LIBTOOLIZE=true AUTORECONFAUTORECONF AUTORECONFAUTORECONFFLAGS
+ || die "autoreconf failed" # Get some extra files from gnulib, overriding existing files. for file in $gnulib_extra_files; do @@ -897,7 +914,7 @@ for file in $gnulib_extra_files; do ) dst=$file;; esac symlink_to_dir "$GNULIB_SRCDIR" filefile filedst
- || { echo "$0: failed to symlink $file" 1>&2; exit 1; } + || die "failed to symlink $file" done if test $with_gettext = yes; then @@ -913,7 +930,8 @@ if test $with_gettext = yes; then a
'"$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 only the 'gettext-h' module is in use, assume autopoint already @@ -921,7 +939,8 @@ if test $with_gettext = yes; then case $gnulib_modules in gettext-h) ;; 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 @@ -937,7 +956,8 @@ if test $with_gettext = yes; then a
'"$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. (cd po && cp -p Makefile.in.in -quot .header .sed *.sin ../runtime-po) diff --git a/gnulib b/gnulib index 26b7d03..4a82904 160000 --- a/gnulib +++ b/gnulib @@ -1 +1 @@ -Subproject commit 26b7d0370e2c6bbc07e86cda0848c341c7f64ec1 +Subproject commit 4a82904680e6974db7b9eed6a3ed4c6eb24ecbe4

1.7.7.6