[Xen-devel] [OSSTEST PATCH V2] build: fix configuration of libvirt

[Jim Fehlig <jfehlig@xxxxxxxx>]

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@xxxxxxxx>
---

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(-)

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
-- 
2.25.0


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel