[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
FYI: maint: gnulib: update
From: |
Akim Demaille |
Subject: |
FYI: maint: gnulib: update |
Date: |
Sat, 7 Apr 2012 15:18:51 +0200 |
Installed in maint.
From 163bb3698ff43cfc88947758701250e23deffca5 Mon Sep 17 00:00:00 2001
From: Akim Demaille <address@hidden>
Date: Sat, 7 Apr 2012 13:51:20 +0200
Subject: [PATCH] gnulib: update.
* bootstrap.conf (bootstrap_sync): True again.
It was disabled while waiting for changes to be integrated
in gnulib's bootstrap, which was done long ago.
* bootstrap, gnulib: Update.
---
bootstrap | 11 ++++++-----
bootstrap.conf | 2 +-
gnulib | 2 +-
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/bootstrap b/bootstrap
index edac17e..31eb651 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,6 +1,6 @@
#! /bin/sh
# Print a version string.
-scriptversion=2012-01-23.10; # UTC
+scriptversion=2012-02-11.09; # UTC
# Bootstrap this package from checked-out sources.
@@ -137,7 +137,7 @@ tests_base=tests
gnulib_extra_files=''
# Additional gnulib-tool options to use. Use "\newline" to break lines.
-gnulib_tool_option_extras='--makefile-name=gnulib.mk'
+gnulib_tool_option_extras=
# Other locale categories that need message catalogs.
EXTRA_LOCALE_CATEGORIES=
@@ -423,7 +423,7 @@ check_versions() {
$use_git || continue
fi
# Honor $APP variables ($TAR, $AUTOCONF, etc.)
- appvar=`echo $app | tr '[a-z]-' '[A-Z]_'`
+ appvar=`echo $app | LC_ALL=C tr '[a-z]-' '[A-Z]_'`
test "$appvar" = TAR && appvar=AMTAR
case $appvar in
GZIP) ;; # Do not use $GZIP: it contains gzip options.
@@ -604,7 +604,7 @@ if $bootstrap_sync; then
fi
gnulib_tool=$GNULIB_SRCDIR/gnulib-tool
-<$gnulib_tool || exit
+<$gnulib_tool || exit $?
# Get translations.
@@ -807,7 +807,8 @@ for file in $gnulib_files; do
symlink_to_dir "$GNULIB_SRCDIR" $file || exit
done
-bootstrap_post_import_hook
+bootstrap_post_import_hook \
+ || { echo >&2 "$me: bootstrap_post_import_hook failed"; exit 1; }
# Remove any dangling symlink matching "*.m4" or "*.[ch]" in some
# gnulib-populated directories. Such .m4 files would cause aclocal to fail.
diff --git a/bootstrap.conf b/bootstrap.conf
index e9b8ba6..2dbcb05 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -82,4 +82,4 @@ bootstrap_epilogue()
# the bootstrap entry from the file .x-update-copyright, and add any
# needed copyright years to the copyright statement in the bootstrap
# script.
-# FIXME: temporary bootstrap_sync=true
+bootstrap_sync=true
diff --git a/gnulib b/gnulib
index 0e9d926..55cc8db 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit 0e9d9267fa36c5493b36c0a2b2e422da101ee4b4
+Subproject commit 55cc8db041f845c2e82ed10aa192ac200ab3f530
--
1.7.9.5
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- FYI: maint: gnulib: update,
Akim Demaille <=