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

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



Eric Blake wrote:
> * cfg.mk (gnulib_dir): Override default in maint.mk.
> * .gnulib: Update to latest.
> Reported by Jim Meyering.
> ---
>
> Update to the latest gnulib for some portability fixes.  Thankfully,
> we already pass all of the new syntax checks, but Jim did note (on
> the gnulib list) that we failed to define $(gnulib_dir) correctly.
>
>  .gnulib |    2 +-
>  cfg.mk  |    3 +++
>  2 files changed, 4 insertions(+), 1 deletions(-)
>
> diff --git a/.gnulib b/.gnulib
> index 7c1b995..411e141 160000
> --- a/.gnulib
> +++ b/.gnulib
> @@ -1 +1 @@
> -Subproject commit 7c1b995a7041ea366acafeb8632e1080f349f03f
> +Subproject commit 411e141164861435385bb9bbb10012da28a077c0
> diff --git a/cfg.mk b/cfg.mk
> index 105b625..9e8909b 100644
> --- a/cfg.mk
> +++ b/cfg.mk
> @@ -24,6 +24,9 @@ gnu_rel_host = $(gnu_ftp_host-$(RELEASE_TYPE))
>  url_dir_list = \
>    ftp://$(gnu_rel_host)/gnu/coreutils
>
> +# We use .gnulib, not gnulib.
> +gnulib_dir = $(srcdir)/.gnulib
> +

Oh!
That highlights the fact that I introduced a bug that
effectively disabled my new test.

Once I fix that bug, the new test fails with this output:
(just-pushed-to-gnulib fix below)


prohibit_always_true_header_tests
configure.ac:144:		AC_DEFINE([HAVE_PTHREAD_H],[],[Define if <pthread.h>])
docs/news.html.in:51:      Add HAVE_PTHREAD_H guard for pthread_sigmask (Matthias Bolte),
python/libvirt-override.c:17:#undef HAVE_PTHREAD_H
python/typewrappers.c:15:#undef HAVE_PTHREAD_H
src/libvirt.c:21:#ifdef HAVE_SYS_WAIT_H
src/nodeinfo.c:38:#ifdef HAVE_SYS_UTSNAME_H
src/remote/remote_driver.c:48:#ifdef HAVE_SYS_WAIT_H
src/remote/remote_driver.c:9490:#ifdef HAVE_PTHREAD_H
src/remote/remote_driver.c:9519:#ifdef HAVE_PTHREAD_H
src/remote/remote_driver.c:9532:#ifdef HAVE_PTHREAD_H
src/storage/storage_backend.c:32:#if HAVE_SYS_WAIT_H
src/util/ebtables.c:37:#ifdef HAVE_SYS_WAIT_H
src/util/hooks.c:27:#if HAVE_SYS_WAIT_H
src/util/iptables.c:35:#ifdef HAVE_SYS_WAIT_H
src/util/processinfo.c:24:#if HAVE_SCHED_H
src/util/threads.c:26:#ifdef HAVE_PTHREAD_H
src/util/threads.h:64:# ifdef HAVE_PTHREAD_H
src/util/util.c:40:#if HAVE_SYS_WAIT_H
src/util/util.c:315:#  ifdef HAVE_PTHREAD_H
src/util/util.c:327:#  ifdef HAVE_PTHREAD_H
src/util/util.c:348:#  ifdef HAVE_PTHREAD_H
src/util/util.c:362:#  ifdef HAVE_PTHREAD_H
src/util/util.c:406:#  ifdef HAVE_PTHREAD_H
maint.mk: do not test the above HAVE_<header>_H symbol(s);
  with the corresponding gnulib module, they are always true
make: *** [sc_prohibit_always_true_header_tests] Error 1


>From 28e80472ab11689bbc4dfc878cf114fe57371e48 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering redhat com>
Date: Tue, 27 Apr 2010 17:29:03 +0200
Subject: [PATCH] maint.mk: fix a bug introduced in last change

* top/maint.mk (gl_assured_headers_): Now that all names are on
one line, use sed's "g" modifier.  Note that while the \.in\.h LHS
is not anchored to end of word, it should be adequate.
---
 ChangeLog    |    5 +++++
 top/maint.mk |    2 +-
 2 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4d6e473..c1c758d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2010-04-27  Jim Meyering  <meyering redhat com>

+	maint.mk: fix a bug introduced in last change
+	* top/maint.mk (gl_assured_headers_): Now that all names are on
+	one line, use sed's "g" modifier.  Note that while the \.in\.h LHS
+	is not anchored to end of word, it should be adequate.
+
 	maint.mk: avoid side-effect in latest syntax-check
 	* top/maint.mk (sc_prohibit_always_true_header_tests): Rework not
 	to run commands via $(shell...), and hence to incur cost only when
diff --git a/top/maint.mk b/top/maint.mk
index 8d9a522..ed41389 100644
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -650,7 +650,7 @@ sc_useless_cpp_parens:
 # #if HAVE_HEADER_H that you remove, be sure that your project explicitly
 # requires the gnulib module that guarantees the usability of that header.
 gl_assured_headers_ = \
-  cd $(gnulib_dir)/lib && echo *.in.h|sed 's/\.in\.h//'
+  cd $(gnulib_dir)/lib && echo *.in.h|sed 's/\.in\.h//g'

 # Convert the list of names to upper case, and replace each space with "|".
 az_ = abcdefghijklmnopqrstuvwxyz
--
1.7.1.328.g9993c


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