[libvirt] [PATCH 0/2] build: update gnulib
The latest gnulib finds a couple more syntax-check cleanups, but it also required some work to avoid requiring gettext 0.18 (since using software just released yesterday won't fly for supporting RHEL5). [PATCH 1/2] build: allow older gettext [PATCH 2/2] build: update gnulib .gnulib | 2 +- bootstrap.conf | 2 +- src/esx/esx_util.c | 6 ------ src/remote/remote_driver.c | 5 ----- tools/virsh.c | 7 +------ 5 files changed, 3 insertions(+), 19 deletions(-)
* bootstrap.conf (gnulib_modules): Use gettext-h, not gettext, since the latter drags in a depedency on gettext 0.18. Suggested by Bruno Haible. --- bootstrap.conf | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/bootstrap.conf b/bootstrap.conf index 1e93490..fa2880a 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -30,7 +30,7 @@ dirname-lgpl getaddrinfo gethostname getpass -gettext +gettext-h gitlog-to-changelog gnumakefile ignore-value -- 1.7.0.1
* .gnulib: Update to latest. * src/esx/esx_util.c (AI_ADDRCONFIG): Rely on gnulib. * src/remote/remote_driver.c (AI_ADDRCONFIG): Likewise. * tools/virsh.c (WEXITSTATUS, O_SYNC): Likewise. --- .gnulib | 2 +- src/esx/esx_util.c | 6 ------ src/remote/remote_driver.c | 5 ----- tools/virsh.c | 7 +------ 4 files changed, 2 insertions(+), 18 deletions(-) diff --git a/.gnulib b/.gnulib index e2843e3..28e5820 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit e2843e30e8c2885eb8cbc77e20c4e0f4d562d44d +Subproject commit 28e58203a7ab14264f8fa450884a89e9ae48025c diff --git a/src/esx/esx_util.c b/src/esx/esx_util.c index 91d19e9..51c9afc 100644 --- a/src/esx/esx_util.c +++ b/src/esx/esx_util.c @@ -38,12 +38,6 @@ #define VIR_FROM_THIS VIR_FROM_ESX -/* AI_ADDRCONFIG is missing on some systems. */ -#ifndef AI_ADDRCONFIG -# define AI_ADDRCONFIG 0 -#endif - - int esxUtil_ParseQuery(xmlURIPtr uri, char **transport, char **vCenter, diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index bd7d617..e4a68ad 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -68,11 +68,6 @@ #include <poll.h> -/* AI_ADDRCONFIG is missing on some systems. */ -#ifndef AI_ADDRCONFIG -# define AI_ADDRCONFIG 0 -#endif - #include "virterror_internal.h" #include "logging.h" #include "datatypes.h" diff --git a/tools/virsh.c b/tools/virsh.c index 21325c3..693d409 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -21,6 +21,7 @@ #include <getopt.h> #include <sys/types.h> #include <sys/time.h> +#include <sys/wait.h> #include "c-ctype.h" #include <fcntl.h> #include <locale.h> @@ -82,9 +83,6 @@ static char *progname; #define LVL_WARNING "WARNING" #define LVL_ERROR "ERROR" -#ifndef WEXITSTATUS -# define WEXITSTATUS(x) ((x) & 0xff) -#endif /** * vshErrorLevel: * @@ -9930,9 +9928,6 @@ vshInit(vshControl *ctl) return TRUE; } -#ifndef O_SYNC -# define O_SYNC 0 -#endif #define LOGFILE_FLAGS (O_WRONLY | O_APPEND | O_CREAT | O_SYNC) /** -- 1.7.0.1
Eric Blake wrote:
* .gnulib: Update to latest. * src/esx/esx_util.c (AI_ADDRCONFIG): Rely on gnulib. * src/remote/remote_driver.c (AI_ADDRCONFIG): Likewise. * tools/virsh.c (WEXITSTATUS, O_SYNC): Likewise. ... diff --git a/src/esx/esx_util.c b/src/esx/esx_util.c ... -/* AI_ADDRCONFIG is missing on some systems. */ -#ifndef AI_ADDRCONFIG -# define AI_ADDRCONFIG 0 -#endif
All looks fine, except the above. You can remove a definition only if the gnulib module that provides the definition is being used. That's provided by the netdb module, and libvirt isn't using it (yet). So just add netdb to the list in bootstrap.conf, and consider this ACK'd.
On 05/11/2010 09:53 AM, Jim Meyering wrote:
Eric Blake wrote:
* .gnulib: Update to latest. * src/esx/esx_util.c (AI_ADDRCONFIG): Rely on gnulib. * src/remote/remote_driver.c (AI_ADDRCONFIG): Likewise. * tools/virsh.c (WEXITSTATUS, O_SYNC): Likewise. ... diff --git a/src/esx/esx_util.c b/src/esx/esx_util.c ... -/* AI_ADDRCONFIG is missing on some systems. */ -#ifndef AI_ADDRCONFIG -# define AI_ADDRCONFIG 0 -#endif
All looks fine, except the above. You can remove a definition only if the gnulib module that provides the definition is being used. That's provided by the netdb module, and libvirt isn't using it (yet).
So just add netdb to the list in bootstrap.conf, and consider this ACK'd.
Thanks, applied with that correction (after re-testing with 'make check'). -- Eric Blake eblake@redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org
participants (2)
-
Eric Blake -
Jim Meyering