[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 1/7] gnulib: update
From: |
Akim Demaille |
Subject: |
[PATCH 1/7] gnulib: update |
Date: |
Thu, 25 Jul 2013 18:28:11 +0200 |
---
bootstrap | 33 ++++++++++++++++++++-------------
gnulib | 2 +-
2 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/bootstrap b/bootstrap
index 0cbea66..a37fb8a 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,6 +1,6 @@
#! /bin/sh
# Print a version string.
-scriptversion=2013-05-08.20; # UTC
+scriptversion=2013-07-03.20; # UTC
# Bootstrap this package from checked-out sources.
@@ -256,12 +256,12 @@ esac
# Extra files from gnulib, which override files from other sources.
test -z "${gnulib_extra_files}" && \
gnulib_extra_files="
- $build_aux/install-sh
- $build_aux/mdate-sh
- $build_aux/texinfo.tex
- $build_aux/depcomp
- $build_aux/config.guess
- $build_aux/config.sub
+ build-aux/install-sh
+ build-aux/mdate-sh
+ build-aux/texinfo.tex
+ build-aux/depcomp
+ build-aux/config.guess
+ build-aux/config.sub
doc/INSTALL
"
@@ -551,7 +551,7 @@ fi
echo "$0: Bootstrapping from checked-out $package sources..."
# See if we can use gnulib's git-merge-changelog merge driver.
-if test -d .git && (git --version) >/dev/null 2>/dev/null ; then
+if $use_git && test -d .git && (git --version) >/dev/null 2>/dev/null ; then
if git config merge.merge-changelog.driver >/dev/null ; then
:
elif (git-merge-changelog --version) >/dev/null 2>/dev/null ; then
@@ -574,13 +574,17 @@ git_modules_config () {
test -f .gitmodules && git config --file .gitmodules "$@"
}
-gnulib_path=$(git_modules_config submodule.gnulib.path)
-test -z "$gnulib_path" && gnulib_path=gnulib
+if $use_git; then
+ gnulib_path=$(git_modules_config submodule.gnulib.path)
+ test -z "$gnulib_path" && gnulib_path=gnulib
+fi
-# Get gnulib files.
+# Get gnulib files. Populate $GNULIB_SRCDIR, possibly updating a
+# submodule, for use in the rest of the script.
case ${GNULIB_SRCDIR--} in
-)
+ # Note that $use_git is necessarily true in this case.
if git_modules_config submodule.gnulib.url >/dev/null; then
echo "$0: getting gnulib files..."
git submodule init || exit $?
@@ -601,8 +605,8 @@ case ${GNULIB_SRCDIR--} in
GNULIB_SRCDIR=$gnulib_path
;;
*)
- # Use GNULIB_SRCDIR as a reference.
- if test -d "$GNULIB_SRCDIR"/.git && \
+ # Use GNULIB_SRCDIR directly or as a reference.
+ if $use_git && test -d "$GNULIB_SRCDIR"/.git && \
git_modules_config submodule.gnulib.url >/dev/null; then
echo "$0: getting gnulib files..."
if git submodule -h|grep -- --reference > /dev/null; then
@@ -628,6 +632,9 @@ case ${GNULIB_SRCDIR--} in
;;
esac
+# $GNULIB_SRCDIR now points to the version of gnulib to use, and
+# we no longer need to use git or $gnulib_path below here.
+
if $bootstrap_sync; then
cmp -s "$0" "$GNULIB_SRCDIR/build-aux/bootstrap" || {
echo "$0: updating bootstrap and restarting..."
diff --git a/gnulib b/gnulib
index e28fbd7..03e96cc 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit e28fbd787cb4861a7848ac6e86c838912b8cd2ec
+Subproject commit 03e96cc338b5237e15fce73e9423526969ee768a
--
1.8.3.3
- [PATCH 0/7] Release 3.0, Akim Demaille, 2013/07/25
- [PATCH 4/7] news: prepare 3.0, Akim Demaille, 2013/07/25
- [PATCH 3/7] tests: fix invalid assignment when using variants in C++11, Akim Demaille, 2013/07/25
- [PATCH 6/7] version 3.0, Akim Demaille, 2013/07/25
- [PATCH 7/7] maint: post-release administrivia, Akim Demaille, 2013/07/25
- [PATCH 1/7] gnulib: update,
Akim Demaille <=
- [PATCH 2/7] yacc: beware of "uninitialized uses" warnings, Akim Demaille, 2013/07/25
- [PATCH 5/7] regen, Akim Demaille, 2013/07/25