[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCH] maint: update to latest gnulib



Upstream gnulib recently patched a bug in bootstrap, for projects
that use a different name than build-aux for a subdirectory.  We
don't, but it doesn't hurt to update.

* .gnulib: Update, for bootstrap fix.
* bootstrap: Sync to upstream.
* bootstrap.conf: Match upstream bug fix.

Signed-off-by: Eric Blake <eblake redhat com>
---

Pushing under the trivial gnulib rule.

* .gnulib da8d59e...644c404 (5):
  > bootstrap: use correct source when copying build-aux files
  > tmpdir: fix bug in VMS port
  > tmpdir: fix typo in previous change
  > * lib/tmpdir.c: Simplify code to add slash; no need for a loop.
  > tmpdir: port to VMS, to // != /, and to long dirs


 .gnulib        |  2 +-
 bootstrap      | 12 ++++++------
 bootstrap.conf |  8 ++++----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.gnulib b/.gnulib
index da8d59e..644c404 160000
--- a/.gnulib
+++ b/.gnulib
@@ -1 +1 @@
-Subproject commit da8d59ee79138b85daee1ad5b22ea12e4fb6ce47
+Subproject commit 644c40496cf7d5a705a73c9dd32b035fcecc2ab1
diff --git a/bootstrap b/bootstrap
index 9c52204..a37fb8a 100755
--- a/bootstrap
+++ b/bootstrap
@@ -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
 "

diff --git a/bootstrap.conf b/bootstrap.conf
index 1c59c22..f166a53 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -233,10 +233,10 @@ touch AUTHORS ChangeLog || exit 1

 # Override bootstrap's list - we don't use mdate-sh or texinfo.tex.
 gnulib_extra_files="
-        $build_aux/install-sh
-        $build_aux/depcomp
-        $build_aux/config.guess
-        $build_aux/config.sub
+        build-aux/install-sh
+        build-aux/depcomp
+        build-aux/config.guess
+        build-aux/config.sub
         doc/INSTALL
 "

-- 
1.8.3.1


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]