From 2ccc60a28e147d960f016fc38060f0d393ab8791 Mon Sep 17 00:00:00 2001 From: Assaf Gordon Date: Mon, 12 May 2014 12:17:06 -0400 Subject: [PATCH] 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 --- bootstrap | 15 +++++++++++++++ 1 file changed, 15 insertions(+) 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. -- 2.47.2