[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] bootstrap: do not require now-removed build-aux/missing
From: |
Jim Meyering |
Subject: |
[PATCH] bootstrap: do not require now-removed build-aux/missing |
Date: |
Tue, 03 Jul 2012 22:28:20 +0200 |
In preparing for a grep release and using the latest from gnulib, I was
surprised to see that bootstrap would fail without printing a diagnostic.
>From d0ea2a12f6fb377f930886d404f3dfc2a732537d Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Tue, 3 Jul 2012 22:22:49 +0200
Subject: [PATCH] bootstrap: do not require now-removed build-aux/missing
Now that build-aux/missing is, er, missing, bootstrap would
silently fail.
* build-aux/bootstrap (gnulib_extra_files): Remove $build_aux/missing
from the list, now that (since commit v0.0-7489-gd0f486f) the file is
no longer part of gnulib.
Diagnose the failure.
---
ChangeLog | 10 ++++++++++
build-aux/bootstrap | 9 +++++----
2 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 9dda6c7..5edb6d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2012-07-03 Jim Meyering <address@hidden>
+
+ bootstrap: do not require now-removed build-aux/missing
+ Now that build-aux/missing is, er, missing, bootstrap would
+ silently fail.
+ * build-aux/bootstrap (gnulib_extra_files): Remove $build_aux/missing
+ from the list, now that (since commit v0.0-7489-gd0f486f) the file is
+ no longer part of gnulib.
+ Diagnose the failure.
+
2012-07-03 Paul Eggert <address@hidden>
alloca: add support for HP NonStop TNS/E native
diff --git a/build-aux/bootstrap b/build-aux/bootstrap
index 300e1a8..e984910 100755
--- a/build-aux/bootstrap
+++ b/build-aux/bootstrap
@@ -1,6 +1,6 @@
#! /bin/sh
# Print a version string.
-scriptversion=2012-05-15.06; # UTC
+scriptversion=2012-07-03.20; # UTC
# Bootstrap this package from checked-out sources.
@@ -230,7 +230,6 @@ esac
test -z "${gnulib_extra_files}" && \
gnulib_extra_files="
$build_aux/install-sh
- $build_aux/missing
$build_aux/mdate-sh
$build_aux/texinfo.tex
$build_aux/depcomp
@@ -855,7 +854,8 @@ echo "$0: $gnulib_tool $gnulib_tool_options --import ..."
$gnulib_tool $gnulib_tool_options --import $gnulib_modules &&
for file in $gnulib_files; do
- symlink_to_dir "$GNULIB_SRCDIR" $file || exit
+ symlink_to_dir "$GNULIB_SRCDIR" $file \
+ || { echo "$0: failed to symlink $file" 1>&2; exit 1; }
done
bootstrap_post_import_hook \
@@ -896,7 +896,8 @@ for file in $gnulib_extra_files; do
build-aux/*) dst=$build_aux/${file#build-aux/};;
*) dst=$file;;
esac
- symlink_to_dir "$GNULIB_SRCDIR" $file $dst || exit
+ symlink_to_dir "$GNULIB_SRCDIR" $file $dst \
+ || { echo "$0: failed to symlink $file" 1>&2; exit 1; }
done
if test $with_gettext = yes; then
--
1.7.11.1.104.ge7b44f1
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [PATCH] bootstrap: do not require now-removed build-aux/missing,
Jim Meyering <=