| Message ID | 20200214155933.7048-1-jfehlig@suse.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [OSSTEST,V2] build: fix configuration of libvirt | expand |
Jim Fehlig writes ("[OSSTEST PATCH V2] build: fix configuration of libvirt"):
> libvirt.git commit 2621d48f00 removed the last traces of gnulib, which
> also removed the '--no-git' option from autogen.sh. Unknown options are
> now passed to the configure script, which quickly fails with
>
> configure: error: unrecognized option: `--no-git'
>
> Remove the gnulib handling from ts-libvirt-build, including the '--no-git'
> option to autogen.sh. While at it remove configure options no longer
> supported by the libvirt configure script.
Harmf. Thanks for looking into this and trying to fix this mess.
I think there is a problem with your patch, which is that 2621d48f00
is recent enough that we might want still to be able to build with
earlier versions.
Is there an easy way to tell (by looking at the tree after checkout,
maybe) whether to do the old or the new thing ?
Your perl code looks good to me for what it is trying to do.
Thanks,
Ian.
On 2/14/20 10:47 AM, Ian Jackson wrote: > Jim Fehlig writes ("[OSSTEST PATCH V2] build: fix configuration of libvirt"): >> libvirt.git commit 2621d48f00 removed the last traces of gnulib, which >> also removed the '--no-git' option from autogen.sh. Unknown options are >> now passed to the configure script, which quickly fails with >> >> configure: error: unrecognized option: `--no-git' >> >> Remove the gnulib handling from ts-libvirt-build, including the '--no-git' >> option to autogen.sh. While at it remove configure options no longer >> supported by the libvirt configure script. > > Harmf. Thanks for looking into this and trying to fix this mess. > > I think there is a problem with your patch, which is that 2621d48f00 > is recent enough that we might want still to be able to build with > earlier versions. Ah, good point. > Is there an easy way to tell (by looking at the tree after checkout, > maybe) whether to do the old or the new thing ? There would be no gnulib directory in a tree checked out after commit 2621d48f00. Another option is to check for the 'bootstrap' script in the root of the tree, which was removed by 2621d48f00. > Your perl code looks good to me for what it is trying to do. I'm afraid my perl is too weak to quickly hack something up to support both pre and post gnulib builds :-(. I'll add this task to my list if you don't have time for it. Regards, Jim
diff --git a/ts-libvirt-build b/ts-libvirt-build index e799f003..ac5afcf2 100755 --- a/ts-libvirt-build +++ b/ts-libvirt-build @@ -26,8 +26,7 @@ tsreadconfig(); selectbuildhost(\@ARGV); builddirsprops(); -our %submodmap = qw(gnulib gnulib - keycodemapdb keycodemapdb); +our %submodmap = qw(keycodemapdb keycodemapdb); our $submodules; sub libvirtd_init (); @@ -50,12 +49,6 @@ sub config() { } die "no xen prefix" unless $xenprefix; - # Uses --no-git because otherwise autogen.sh will undo - # submodulefixup's attempts to honour - # revision_libvirt_gnulib. This in turn requires that we specify - # --gnulib-srcdir, but ./autogen.sh doesn't propagate - # --gnulib-srcdir to ./bootstap so we use GNULIB_SRCDIR directly. - my $gnulib = submodule_find($submodules, "gnulib"); target_cmd_build($ho, 3600, $builddir, <<END); cd libvirt mkdir build @@ -63,10 +56,9 @@ sub config() { CFLAGS="-g -I$xenprefix/include/" \\ LDFLAGS="-g -L$xenprefix/lib/ -Wl,-rpath-link=$xenprefix/lib/" \\ PKG_CONFIG_PATH="$xenprefix/lib/pkgconfig/" \\ - GNULIB_SRCDIR=$builddir/libvirt/$gnulib->{Path} \\ - ../autogen.sh --no-git \\ - --with-libxl --without-xen --without-xenapi --without-selinux \\ - --without-lxc --without-vbox --without-uml \\ + ../autogen.sh \\ + --with-libxl --without-selinux \\ + --without-lxc --without-vbox \\ --without-qemu --without-openvz --without-vmware \\ --sysconfdir=/etc --localstatedir=/var #/ END
libvirt.git commit 2621d48f00 removed the last traces of gnulib, which also removed the '--no-git' option from autogen.sh. Unknown options are now passed to the configure script, which quickly fails with configure: error: unrecognized option: `--no-git' Remove the gnulib handling from ts-libvirt-build, including the '--no-git' option to autogen.sh. While at it remove configure options no longer supported by the libvirt configure script. Signed-off-by: Jim Fehlig <jfehlig@suse.com> --- The only change from V1 is adding Ian to cc. I have poor perl skills, but hopefully this fixes the latest build failures of the libvirt test project, e.g. http://logs.test-lab.xenproject.org/osstest/logs/146921/build-amd64-libvirt/6.ts-libvirt-build.log ts-libvirt-build | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-)