On Thu, Jul 09, 2009 at 08:39:32PM +0200, Jim Meyering wrote:
Jim Meyering wrote:
...
> I had fixed the latter in gnulib (now that main.mk comes
> from there), but had forgotten to tell libvirt to use
> the latest version of gnulib, in order to get that fix.
> To do that, I ran "git syncsub" (where syncsub is an alias:
> syncsub = submodule foreach git pull origin master)
> then git commit -a.
>
> Here are the two patches I'm about to push:
...
>>From 72978b978991f106dc0e36b10a942d9040a1df00 Mon Sep 17 00:00:00 2001
> From: Jim Meyering <meyering(a)redhat.com>
> Date: Thu, 9 Jul 2009 20:02:31 +0200
> Subject: [PATCH 2/2] build: update from gnulib, for latest maint.mk
>
> * gnulib: Update submodule to latest.
> This fixes the make syntax-check failure whereby sc_po_check
> would complain about cfg.mk.
> ---
> .gnulib | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/.gnulib b/.gnulib
> index 1203e8d..b653eda 160000
> --- a/.gnulib
> +++ b/.gnulib
> @@ -1 +1 @@
> -Subproject commit 1203e8d1f62dec3d2436dffadd5c20793cf84366
> +Subproject commit b653eda3ac4864de205419d9f41eec267cb89eeb
Note how that patch changed the .gnulib submodule.
When you pull such a change, you have to know to run ./bootstrap
to pull in updated-from-gnulib files.
Yeah, this is the kind of scenario where I think it'd be good to have
autogen.sh somehow notice the .gnulib submodule hash changed, and
automatically run bootstrap to re-sync.
Daniel
--
|: Red Hat, Engineering, London -o-
http://people.redhat.com/berrange/ :|
|:
http://libvirt.org -o-
http://virt-manager.org -o-
http://ovirt.org :|
|:
http://autobuild.org -o-
http://search.cpan.org/~danberr/ :|
|: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|