From: Assaf Gordon <assafgordon@gmail.com>
Date: Mon, 12 May 2014 16:17:06 +0000 (-0400)
Subject: build: avoid bootstrap error with gettext 0.18.3.1
X-Git-Tag: v8.23~71
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ccc60a28e147d960f016fc38060f0d393ab8791;p=thirdparty%2Fcoreutils.git

build: avoid bootstrap error with gettext 0.18.3.1

* bootstrap: Create critical bootstrap files for autopoint,
before gnulib re-generates them, avoiding the issue.  See:
http://lists.gnu.org/archive/html/coreutils/2013-11/msg00038.html
http://savannah.gnu.org/bugs/?40083
https://pad.lv/1311895
---

diff --git a/bootstrap b/bootstrap
index ce90bc419f..a3e68f0095 100755
--- a/bootstrap
+++ b/bootstrap
@@ -807,6 +807,21 @@ version_controlled_file() {
   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.