[Pkg-libvirt-commits] [libguestfs] 15/16: Updated patch queue; upstream now makes it possible (not the default) to disable the Gnulib tests.

[Hilko Bengen]

This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to branch experimental
in repository libguestfs.

commit a578878f2dc7830ef6a90ade1f11006f80df9076
Author: Hilko Bengen <bengen at debian.org>
Date:   Sat Mar 8 18:15:05 2014 +0100

    Updated patch queue; upstream now makes it possible (not the default) to disable the Gnulib tests.
---
 .../0003-Disable-gnulib-tests-by-default.patch     | 45 ----------------------
 ...> 0003-golang-Fix-for-out-of-tree-builds.patch} |  2 +-
 debian/patches/series                              |  3 +-
 debian/rules                                       |  1 +
 4 files changed, 3 insertions(+), 48 deletions(-)

diff --git a/debian/patches/0003-Disable-gnulib-tests-by-default.patch b/debian/patches/0003-Disable-gnulib-tests-by-default.patch
deleted file mode 100644
index 0df25c0..0000000
--- a/debian/patches/0003-Disable-gnulib-tests-by-default.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From: Hilko Bengen <bengen at debian.org>
-Date: Sat, 1 Jun 2013 15:12:27 +0200
-Subject: Disable gnulib tests by default
-
----
- Makefile.am  | 5 ++++-
- configure.ac | 9 +++++++++
- 2 files changed, 13 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index b47a572..020628e 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -20,7 +20,10 @@ include $(top_srcdir)/common-rules.mk
- ACLOCAL_AMFLAGS = -I m4
- 
- # Gnulib - must be built and tested before the library.
--SUBDIRS = gnulib/lib gnulib/tests
-+SUBDIRS = gnulib/lib
-+if ENABLE_GNULIB_TESTS
-+SUBDIRS += gnulib/tests
-+endif
- 
- # Basic source for the library.
- SUBDIRS += tests/data generator src examples po
-diff --git a/configure.ac b/configure.ac
-index c50f0d2..49a40d7 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1553,6 +1553,15 @@ dnl For search paths.
- AC_DEFINE_UNQUOTED([PATH_SEPARATOR],["$PATH_SEPARATOR"],
-                    [Character that separates path elements in search paths])
- 
-+AC_ARG_ENABLE([gnulib-tests],
-+    [AS_HELP_STRING([--disable-gnulib-tests],
-+        [disable running GNU Portability library tests @<:@default=yes@:>@])],
-+        [ENABLE_GNULIB_TESTS="$enableval"],
-+        [ENABLE_GNULIB_TESTS=no])
-+AM_CONDITIONAL([ENABLE_GNULIB_TESTS],[test "x$ENABLE_GNULIB_TESTS" = "xyes"])
-+AC_MSG_RESULT([$ENABLE_GNULIB_TESTS])
-+AC_SUBST([ENABLE_GNULIB_TESTS])
-+
- dnl Library versioning.
- MAX_PROC_NR=`cat $srcdir/src/MAX_PROC_NR`
- AC_SUBST(MAX_PROC_NR)
diff --git a/debian/patches/0004-golang-Fix-for-out-of-tree-builds.patch b/debian/patches/0003-golang-Fix-for-out-of-tree-builds.patch
similarity index 97%
rename from debian/patches/0004-golang-Fix-for-out-of-tree-builds.patch
rename to debian/patches/0003-golang-Fix-for-out-of-tree-builds.patch
index 5e12e50..2a15936 100644
--- a/debian/patches/0004-golang-Fix-for-out-of-tree-builds.patch
+++ b/debian/patches/0003-golang-Fix-for-out-of-tree-builds.patch
@@ -8,7 +8,7 @@ Subject: golang: Fix for out-of-tree builds
  2 files changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index 49a40d7..6c5c29b 100644
+index 35460e2..42c435e 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -1445,7 +1445,7 @@ AS_IF([test "x$enable_golang" != "xno"],[
diff --git a/debian/patches/series b/debian/patches/series
index b46df74..708b7d4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 0001-Fix-guestfs-supermin-appliance-path.patch
 0002-perl-revert-failed-attempt-at-building-out-of-tree-s.patch
-0003-Disable-gnulib-tests-by-default.patch
-0004-golang-Fix-for-out-of-tree-builds.patch
+0003-golang-Fix-for-out-of-tree-builds.patch
diff --git a/debian/rules b/debian/rules
index 6adb5cc..1da2130 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,6 +19,7 @@ QEMU_CPU := $(shell dpkg-architecture -qDEB_HOST_GNU_CPU \
 
 DEFAULT_CONFIG_FLAGS = \
 	--disable-appliance        \
+	--disable-gnulib-tests     \
 	--with-readline	           \
 	--disable-haskell          \
 	--disable-php	           \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libguestfs.git