Re: [PATCH] build: update gnulib submodule and tests/init.sh to latest

[Bernhard Voelker]

On 06/11/2014 04:17 PM, Pádraig Brady wrote:
> On 06/11/2014 02:44 PM, Bernhard Voelker wrote:
> > On 06/11/2014 01:19 PM, Pádraig Brady wrote:
> > > * gnulib: Update to latest.
> > > * tests/init.sh: Update from gnulib.
> >
> > What about bootstrap?
>
> nothing new in gnulib's version

I was confused: we had a change in coreutils' local copy
of that file: v8.22-88-g2ccc60a

diff -u {gnulib/build-aux/,}bootstrap
--- gnulib/build-aux/bootstrap  2014-01-02 20:17:25.625701244 +0100
+++ bootstrap   2014-05-14 13:18:11.179384827 +0200
@@ -807,6 +807,21 @@
   fi
 }

+# Avoid boostrap failure with gettext/autopoint bug in version 0.18.3.1
+# http://lists.gnu.org/archive/html/coreutils/2013-11/msg00038.html
+# Remove in 2015 when distros have upgraded to >= 0.18.3.2
+autopoint_version=$(get_version $AUTOPOINT)
+# Note autopoint returns version 0.18.3 for version 0.18.3.1
+if test "$autopoint_version" = '0.18.3' ; then
+  if test "$package" = 'coreutils' ; then
+    test -e 'm4/cu-progs.m4' || touch 'm4/cu-progs.m4'
+  fi
+  if ! test -e 'build-aux/git-version-gen' ; then
+    printf "#!/bin/sh\n" > 'build-aux/git-version-gen'
+    chmod a+x 'build-aux/git-version-gen'
+  fi
+fi
+
 # NOTE: we have to be careful to run both autopoint and libtoolize
 # before gnulib-tool, since gnulib-tool is likely to provide newer
 # versions of files "installed" by these two programs.

Sorry for the noise.

Have a nice day,
Berny