[PATCH] build: update gnulib, bootstrap, gl/lib/regcomp.c.diff

[Jim Meyering]

FYI,

>From a8478ac32c7e987b392973d12dc4c97dc31202d7 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Sat, 11 Feb 2012 10:43:50 +0100
Subject: [PATCH] build: update gnulib, bootstrap, gl/lib/regcomp.c.diff

* gnulib: Update submodule to latest.
* bootstrap: Update from gnulib.
* gl/lib/regcomp.c.diff: Adapt to gnulib changes.
---
 bootstrap             |   30 +++++++++++++++++++++---------
 gl/lib/regcomp.c.diff |   28 ++++++++++++++++------------
 gnulib                |    2 +-
 3 files changed, 38 insertions(+), 22 deletions(-)

diff --git a/bootstrap b/bootstrap
index 53b73d0..c8ee3cc 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Print a version string.
-scriptversion=2011-12-17.15; # UTC
+scriptversion=2012-02-11.09; # UTC

 # Bootstrap this package from checked-out sources.

@@ -87,9 +87,9 @@ gnulib_files=
 : ${AUTOPOINT=autopoint}
 : ${AUTORECONF=autoreconf}

-# A function to be called to edit gnulib.mk right after it's created.
+# A function to be called right after gnulib-tool is run.
 # Override it via your own definition in bootstrap.conf.
-gnulib_mk_hook() { :; }
+bootstrap_post_import_hook() { :; }

 # A function to be called after everything else in this script.
 # Override it via your own definition in bootstrap.conf.
@@ -316,8 +316,8 @@ insert_vc_ignore() {
   pattern="$2"
   case $vc_ignore_file in
   *.gitignore)
-    # A .gitignore entry that does not start with `/' applies
-    # recursively to subdirectories, so prepend `/' to every
+    # A .gitignore entry that does not start with '/' applies
+    # recursively to subdirectories, so prepend '/' to every
     # .gitignore entry.
     pattern=`echo "$pattern" | sed s,^,/,`;;
   esac
@@ -604,7 +604,7 @@ if $bootstrap_sync; then
 fi

 gnulib_tool=$GNULIB_SRCDIR/gnulib-tool
-<$gnulib_tool || exit
+<$gnulib_tool || exit $?

 # Get translations.

@@ -758,7 +758,7 @@ fi
 # Autoreconf runs aclocal before libtoolize, which causes spurious
 # warnings if the initial aclocal is confused by the libtoolized
 # (or worse out-of-date) macro directory.
-if grep '^[    ]*LT_INIT' configure.ac >/dev/null; then
+if test $use_libtool = 1; then
   echo "running: $LIBTOOLIZE --copy --install"
   $LIBTOOLIZE --copy --install
 fi
@@ -807,6 +807,9 @@ for file in $gnulib_files; do
   symlink_to_dir "$GNULIB_SRCDIR" $file || exit
 done

+bootstrap_post_import_hook \
+  || { echo >&2 "$me: bootstrap_post_import_hook failed"; exit 1; }
+
 # Remove any dangling symlink matching "*.m4" or "*.[ch]" in some
 # gnulib-populated directories.  Such .m4 files would cause aclocal to fail.
 # The following requires GNU find 4.2.3 or newer.  Considering the usual
@@ -819,11 +822,20 @@ find "$m4_base" "$source_base" \
   -depth \( -name '*.m4' -o -name '*.[ch]' \) \
   -type l -xtype l -delete > /dev/null 2>&1

+# 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;;
+esac
+
 # Tell autoreconf not to invoke autopoint or libtoolize; they were run above.
 echo "running: AUTOPOINT=true LIBTOOLIZE=true " \
-    "$AUTORECONF --verbose --install --no-recursive -I $m4_base"
+    "$AUTORECONF --verbose --install $no_recursive -I $m4_base $ACLOCAL_FLAGS"
 AUTOPOINT=true LIBTOOLIZE=true \
-    $AUTORECONF --verbose --install --no-recursive -I $m4_base \
+    $AUTORECONF --verbose --install $no_recursive -I $m4_base $ACLOCAL_FLAGS \
   || exit 1

 # Get some extra files from gnulib, overriding existing files.
diff --git a/gl/lib/regcomp.c.diff b/gl/lib/regcomp.c.diff
index 63fc187..d79c7b2 100644
--- a/gl/lib/regcomp.c.diff
+++ b/gl/lib/regcomp.c.diff
@@ -11,7 +11,7 @@ index d5968bd..4926676 100644
          char *_Restrict_ errbuf, size_t errbuf_size)
  #endif
  {
-@@ -1383,7 +1383,7 @@ calc_first (void *extra, bin_tree_t *node)
+@@ -1415,7 +1415,7 @@ calc_first (void *extra, bin_tree_t *node)

  /* Pass 2: compute NEXT on the tree.  Preorder visit.  */
  static reg_errcode_t
@@ -20,17 +20,20 @@ index d5968bd..4926676 100644
  {
    switch (node->token.type)
      {
-@@ -2744,7 +2744,8 @@ static reg_errcode_t
+@@ -2792,8 +2792,10 @@ build_range_exp (const reg_syntax_t synt
+ static reg_errcode_t
  internal_function
- build_collating_symbol (bitset_t sbcset,
  # ifdef RE_ENABLE_I18N
--                      re_charset_t *mbcset, Idx *coll_sym_alloc,
-+                      re_charset_t *mbcset _UNUSED_PARAMETER_,
+-build_collating_symbol (bitset_t sbcset, re_charset_t *mbcset,
+-                      Idx *coll_sym_alloc, const unsigned char *name)
++build_collating_symbol (bitset_t sbcset,
++                        re_charset_t *mbcset _UNUSED_PARAMETER_,
 +                      Idx *coll_sym_alloc _UNUSED_PARAMETER_,
- # endif
-                       const unsigned char *name)
- {
-@@ -3323,7 +3324,8 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, 
re_token_t *token,
++                        const unsigned char *name)
+ # else /* not RE_ENABLE_I18N */
+ build_collating_symbol (bitset_t sbcset, const unsigned char *name)
+ # endif /* not RE_ENABLE_I18N */
+@@ -3377,7 +3379,8 @@ parse_bracket_exp (re_string_t *regexp,

  static reg_errcode_t
  parse_bracket_element (bracket_elem_t *elem, re_string_t *regexp,
@@ -40,19 +43,20 @@ index d5968bd..4926676 100644
                       reg_syntax_t syntax, bool accept_hyphen)
  {
  #ifdef RE_ENABLE_I18N
-@@ -3410,8 +3412,9 @@ parse_bracket_symbol (bracket_elem_t *elem, re_string_t 
*regexp,
+@@ -3464,8 +3467,10 @@ parse_bracket_symbol (bracket_elem_t *elem, re_string_t 
*regexp,

  static reg_errcode_t
  #ifdef RE_ENABLE_I18N
 -build_equiv_class (bitset_t sbcset, re_charset_t *mbcset,
 -                 Idx *equiv_class_alloc, const unsigned char *name)
-+build_equiv_class (bitset_t sbcset, re_charset_t *mbcset _UNUSED_PARAMETER_,
++build_equiv_class (bitset_t sbcset,
++                   re_charset_t *mbcset _UNUSED_PARAMETER_,
 +                 Idx *equiv_class_alloc _UNUSED_PARAMETER_,
 +                 const unsigned char *name)
  #else /* not RE_ENABLE_I18N */
  build_equiv_class (bitset_t sbcset, const unsigned char *name)
  #endif /* not RE_ENABLE_I18N */
-@@ -3816,7 +3819,7 @@ free_token (re_token_t *node)
+@@ -3869,1 +3874,1 @@ free_token (re_token_t *node)
     and its children. */

  static reg_errcode_t
diff --git a/gnulib b/gnulib
index bfb5863..de009b6 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit bfb5863e350590d8fe9a643d840c7d0b5f3d934b
+Subproject commit de009b65198c00dbe0ecd796ce75d5d9f5346103
--
1.7.9.190.gf1d33