From: Jim Fehlig <jfehlig@suse.com>
To: <xen-devel@lists.xenproject.org>
Cc: Jim Fehlig <jfehlig@suse.com>, ian.jackson@eu.citrix.com
Subject: [Xen-devel] [OSSTEST PATCH V2] build: fix configuration of libvirt
Date: Fri, 14 Feb 2020 08:59:33 -0700 [thread overview]
Message-ID: <20200214155933.7048-1-jfehlig@suse.com> (raw)
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(-)
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@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
next reply other threads:[~2020-02-14 16:11 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-14 15:59 Jim Fehlig [this message]
2020-02-14 17:47 ` [Xen-devel] [OSSTEST PATCH V2] build: fix configuration of libvirt Ian Jackson
2020-02-17 23:41 ` Jim Fehlig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200214155933.7048-1-jfehlig@suse.com \
--to=jfehlig@suse.com \
--cc=ian.jackson@eu.citrix.com \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).