On 05/05/2014 02:42 PM, Pádraig Brady wrote:
On 05/05/2014 06:34 PM, Assaf Gordon wrote:
On 05/03/2014 05:52 AM, Pádraig Brady wrote:
We wouldn't be wanting the cu-progs.m4 in other projects though,
so we should probably conditionalize that to just $package = coreutils.
It wouldn't be worth adding new hooks for this to generalize.
To clarify: do you mean conditionalize just the "cu-progs.m4" part, or the entire
work-around with "$package = coreutils" ?
Just the cu-progs.m4 bit
Attached is an updated patch.
Comments are welcomed.
-gordon
>From ba30f3d9f5f217883fb13d06354f2c8478f598d6 Mon Sep 17 00:00:00 2001
From: "Assaf Gordon" <[email protected]>
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.
This avoids a bug in gettext/autopoint version 0.18.3.1 (which
is advertised as 0.18.3).
See:
http://lists.gnu.org/archive/html/coreutils/2013-11/msg00038.html
http://savannah.gnu.org/bugs/?40083
https://bugs.launchpad.net/ubuntu/+source/gettext/+bug/1311895
---
bootstrap | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/bootstrap b/bootstrap
index ce90bc4..9cd8024 100755
--- a/bootstrap
+++ b/bootstrap
@@ -807,6 +807,22 @@ version_controlled_file() {
fi
}
+
+# Work-around for gettext/autopoint bug in version 0.18.3.1:
+# Create dummy 'm4/cu-progs.m4' and 'build-aux/git-version-gen'
+# to avoid 'bootstrap' failure.
+# http://lists.gnu.org/archive/html/coreutils/2013-11/msg00038.html
+autopoint_version=$(get_version $AUTOPOINT)
+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.
--
1.9.1
