summaryrefslogtreecommitdiff
path: root/bootstrap
diff options
context:
space:
mode:
authorAssaf Gordon <assafgordon@gmail.com>2014-05-12 12:17:06 -0400
committerPádraig Brady <P@draigBrady.com>2014-05-12 19:14:34 +0100
commit2ccc60a28e147d960f016fc38060f0d393ab8791 (patch)
treefe9a4a6548e1fbd02fa78f127d07b62293f85a0a /bootstrap
parentd7cfcbef7eb2cd12ac83e5c1c123de2015adbef9 (diff)
downloadcoreutils-2ccc60a28e147d960f016fc38060f0d393ab8791.tar.xz
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
Diffstat (limited to 'bootstrap')
-rwxr-xr-xbootstrap15
1 files changed, 15 insertions, 0 deletions
diff --git a/bootstrap b/bootstrap
index ce90bc419..a3e68f009 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.