libvirt: Explicitly configure (--with-X=yes/no/check)

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: libvirt: Explicitly configure (--with-X=yes/no/check)
From: Sijmen J. Mulder <sjmulder%NetBSD.org@localhost>
Date: Tue, 10 Aug 2021 11:56:52 +0000
Module Name:	pkgsrc-wip
Committed By:	Sijmen J. Mulder <sjmulder%NetBSD.org@localhost>
Pushed By:	sjmulder
Date:		Tue Aug 10 13:56:52 2021 +0200
Changeset:	1df6490882fca214ddb160d4a41f315978448945

Modified Files:
	libvirt/Makefile
	libvirt/PLIST
	libvirt/PLIST.Linux
	libvirt/TODO

Log Message:
libvirt: Explicitly configure (--with-X=yes/no/check)

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=1df6490882fca214ddb160d4a41f315978448945

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 libvirt/Makefile    | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++--
 libvirt/PLIST       | 28 ---------------------
 libvirt/PLIST.Linux | 31 +-----------------------
 libvirt/TODO        |  9 ++-----
 4 files changed, 71 insertions(+), 67 deletions(-)

diffs:
diff --git a/libvirt/Makefile b/libvirt/Makefile
index c0850d88c7..ae4a4ed1c0 100644
--- a/libvirt/Makefile
+++ b/libvirt/Makefile
@@ -45,14 +45,80 @@ CONF_FILES+=		${EGDIR}/logrotate.d/libvirtd.libxl ${PKG_SYSCONFDIR}/libvirtlogro
 CONF_FILES+=		${EGDIR}/logrotate.d/libvirtd.lxc ${PKG_SYSCONFDIR}/libvirtlogrotate.d/libvirtd.lxc
 CONF_FILES+=		${EGDIR}/logrotate.d/libvirtd.qemu ${PKG_SYSCONFDIR}/libvirtlogrotate.d/libvirtd.qemu
 
+CONFIGURE_ARGS+=	--with-libpcap=yes
+CONFIGURE_ARGS+=	--with-libxml=yes
+CONFIGURE_ARGS+=	--with-yajl=yes
+
+CONFIGURE_ARGS+=	--with-sysctl=check
+
+CONFIGURE_ARGS+=	--with-apparmor=no
+CONFIGURE_ARGS+=	--with-attr=no
+CONFIGURE_ARGS+=	--with-bash-completion=no
+CONFIGURE_ARGS+=	--with-blkid=no
+CONFIGURE_ARGS+=	--with-capng=no
+CONFIGURE_ARGS+=	--with-curl=no
+CONFIGURE_ARGS+=	--with-dbus=no
+CONFIGURE_ARGS+=	--with-firewalld=no
+CONFIGURE_ARGS+=	--with-fuse=no
+CONFIGURE_ARGS+=	--with-glusterfs=no
+CONFIGURE_ARGS+=	--with-hal=no
+CONFIGURE_ARGS+=	--with-libiscsi=no
+CONFIGURE_ARGS+=	--with-libssh=no
+CONFIGURE_ARGS+=	--with-macvtap=no
+CONFIGURE_ARGS+=	--with-netcf=no
+CONFIGURE_ARGS+=	--with-nss-plugin=no
+CONFIGURE_ARGS+=	--with-numactl=no
+CONFIGURE_ARGS+=	--with-openwsman=no
+CONFIGURE_ARGS+=	--with-pciaccess=no
+CONFIGURE_ARGS+=	--with-pm-utils=no
+CONFIGURE_ARGS+=	--with-polkit=no
+CONFIGURE_ARGS+=	--with-readline=no
+CONFIGURE_ARGS+=	--with-sanlock=no
+CONFIGURE_ARGS+=	--with-sasl=no
+CONFIGURE_ARGS+=	--with-selinux=no
+CONFIGURE_ARGS+=	--with-selinux-mount=no
+CONFIGURE_ARGS+=	--with-ssh2=no
+CONFIGURE_ARGS+=	--with-udev=no
+CONFIGURE_ARGS+=	--with-virtualport=no
+CONFIGURE_ARGS+=	--with-wireshark-dissector=no
+CONFIGURE_ARGS+=	--with-qemu=no
+CONFIGURE_ARGS+=	--with-openvz=no
+CONFIGURE_ARGS+=	--with-vmware=no
+CONFIGURE_ARGS+=	--with-phyp=no
+CONFIGURE_ARGS+=	--with-libxl=no
+CONFIGURE_ARGS+=	--with-vbox=no
+CONFIGURE_ARGS+=	--with-lxc=no
+CONFIGURE_ARGS+=	--with-vz=no
+CONFIGURE_ARGS+=	--with-bhyve=no
+CONFIGURE_ARGS+=	--with-esx=no
+CONFIGURE_ARGS+=	--with-hyperv=no
+CONFIGURE_ARGS+=	--with-interface=no
+CONFIGURE_ARGS+=	--with-dtrace=no
+CONFIGURE_ARGS+=	--with-numad=no
+CONFIGURE_ARGS+=	--with-login-shell=no
+CONFIGURE_ARGS+=	--with-host-validate=no
+CONFIGURE_ARGS+=	--with-secdriver-linux=no
+CONFIGURE_ARGS+=	--with-secdriver-apparmor=no
+CONFIGURE_ARGS+=	--with-apparmor-profiles=no
+CONFIGURE_ARGS+=	--with-storage-fs=no
+CONFIGURE_ARGS+=	--with-storage-lvm=no
+CONFIGURE_ARGS+=	--with-storage-iscsi=no
+CONFIGURE_ARGS+=	--with-storage-iscsi-direct=no
+CONFIGURE_ARGS+=	--with-storage-scsi=no
+CONFIGURE_ARGS+=	--with-storage-mpath=no
+CONFIGURE_ARGS+=	--with-storage-disk=no
+CONFIGURE_ARGS+=	--with-storage-rbd=no
+CONFIGURE_ARGS+=	--with-storage-sheepdog=no
+CONFIGURE_ARGS+=	--with-storage-gluster=no
+CONFIGURE_ARGS+=	--with-storage-zfs=no
+CONFIGURE_ARGS+=	--with-storage-vstorage=no
+
 CONFIGURE_ARGS.NetBSD+=	--with-qemu-group=wheel
 
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "Linux"
 .include "../../wip/libnl1/buildlink3.mk"
-.include "../../wip/lvm2/buildlink3.mk"
-.include "../../wip/portablexdr/buildlink3.mk"
 .endif
 
 .include "../../devel/yajl/buildlink3.mk"
diff --git a/libvirt/PLIST b/libvirt/PLIST
index 96990ee787..fb1ff3140a 100644
--- a/libvirt/PLIST
+++ b/libvirt/PLIST
@@ -1,7 +1,6 @@
 @comment $NetBSD$
 bin/virsh
 bin/virt-admin
-bin/virt-host-validate
 bin/virt-pki-validate
 bin/virt-xml-validate
 include/libvirt/libvirt-admin.h
@@ -27,13 +26,10 @@ lib/libvirt-lxc.la
 lib/libvirt-qemu.la
 lib/libvirt.la
 lib/libvirt/connection-driver/libvirt_driver_network.la
-lib/libvirt/connection-driver/libvirt_driver_qemu.la
 lib/libvirt/connection-driver/libvirt_driver_secret.la
 lib/libvirt/connection-driver/libvirt_driver_storage.la
-lib/libvirt/connection-driver/libvirt_driver_vbox.la
 lib/libvirt/lock-driver/lockd.la
 lib/libvirt/storage-backend/libvirt_storage_backend_fs.la
-lib/libvirt/storage-backend/libvirt_storage_backend_zfs.la
 lib/libvirt/storage-file/libvirt_storage_file_fs.la
 lib/pkgconfig/libvirt-admin.pc
 lib/pkgconfig/libvirt-lxc.pc
@@ -44,7 +40,6 @@ libexec/libvirt_iohelper
 libexec/libvirt_leaseshelper
 man/man1/virsh.1
 man/man1/virt-admin.1
-man/man1/virt-host-validate.1
 man/man1/virt-pki-validate.1
 man/man1/virt-xml-validate.1
 man/man7/virkeycode-atset1.7
@@ -67,32 +62,23 @@ sbin/virtlockd
 sbin/virtlogd
 sbin/virtnetworkd
 sbin/virtproxyd
-sbin/virtqemud
 sbin/virtsecretd
 sbin/virtstoraged
-sbin/virtvboxd
 share/augeas/lenses/libvirt_lockd.aug
 share/augeas/lenses/libvirtd.aug
-share/augeas/lenses/libvirtd_qemu.aug
-share/augeas/lenses/tests/test_libvirt_lockd.aug
 share/augeas/lenses/tests/test_libvirtd.aug
-share/augeas/lenses/tests/test_libvirtd_qemu.aug
 share/augeas/lenses/tests/test_virtlockd.aug
 share/augeas/lenses/tests/test_virtlogd.aug
 share/augeas/lenses/tests/test_virtnetworkd.aug
 share/augeas/lenses/tests/test_virtproxyd.aug
-share/augeas/lenses/tests/test_virtqemud.aug
 share/augeas/lenses/tests/test_virtsecretd.aug
 share/augeas/lenses/tests/test_virtstoraged.aug
-share/augeas/lenses/tests/test_virtvboxd.aug
 share/augeas/lenses/virtlockd.aug
 share/augeas/lenses/virtlogd.aug
 share/augeas/lenses/virtnetworkd.aug
 share/augeas/lenses/virtproxyd.aug
-share/augeas/lenses/virtqemud.aug
 share/augeas/lenses/virtsecretd.aug
 share/augeas/lenses/virtstoraged.aug
-share/augeas/lenses/virtvboxd.aug
 share/doc/libvirt/examples/c/admin/client_close.c
 share/doc/libvirt/examples/c/admin/client_info.c
 share/doc/libvirt/examples/c/admin/client_limits.c
@@ -302,18 +288,14 @@ share/doc/libvirt/html/windows.html
 share/examples/libvirt/libvirt-admin.conf
 share/examples/libvirt/libvirt.conf
 share/examples/libvirt/libvirtd.conf
-share/examples/libvirt/qemu-lockd.conf
-share/examples/libvirt/qemu.conf
 share/examples/libvirt/qemu/networks/autostart/default.xml
 share/examples/libvirt/qemu/networks/default.xml
 share/examples/libvirt/virtlockd.conf
 share/examples/libvirt/virtlogd.conf
 share/examples/libvirt/virtnetworkd.conf
 share/examples/libvirt/virtproxyd.conf
-share/examples/libvirt/virtqemud.conf
 share/examples/libvirt/virtsecretd.conf
 share/examples/libvirt/virtstoraged.conf
-share/examples/libvirt/virtvboxd.conf
 share/examples/logrotate.d/libvirtd
 share/examples/logrotate.d/libvirtd.libxl
 share/examples/logrotate.d/libvirtd.lxc
@@ -501,13 +483,3 @@ share/locale/zh_CN/LC_MESSAGES/libvirt.mo
 share/locale/zh_HK/LC_MESSAGES/libvirt.mo
 share/locale/zh_TW/LC_MESSAGES/libvirt.mo
 share/locale/zu/LC_MESSAGES/libvirt.mo
-@pkgdir share/gtk-doc/html/libvirt
-@pkgdir share/doc/libvirt/examples/rename
-@pkgdir share/doc/libvirt/examples/openauth
-@pkgdir share/doc/libvirt/examples/object-events
-@pkgdir share/doc/libvirt/examples/hellolibvirt
-@pkgdir share/doc/libvirt/examples/domtop
-@pkgdir share/doc/libvirt/examples/domsuspend
-@pkgdir share/doc/libvirt/examples/dommigrate
-@pkgdir share/doc/libvirt/examples/dominfo
-@pkgdir share/doc/libvirt/examples/admin
diff --git a/libvirt/PLIST.Linux b/libvirt/PLIST.Linux
index f4fe9494a7..4645f981d5 100644
--- a/libvirt/PLIST.Linux
+++ b/libvirt/PLIST.Linux
@@ -1,13 +1,5 @@
-bin/virt-login-shell
-libexec/libvirt_lxc
-libexec/virt-login-shell-helper
-lib/libnss_libvirt_guest.la
-lib/libnss_libvirt.la
-lib/libvirt/connection-driver/libvirt_driver_lxc.la
+@comment $NetBSD$
 lib/libvirt/connection-driver/libvirt_driver_nwfilter.la
-lib/libvirt/storage-backend/libvirt_storage_backend_logical.la
-lib/libvirt/storage-backend/libvirt_storage_backend_mpath.la
-lib/libvirt/storage-backend/libvirt_storage_backend_scsi.la
 lib/sysctl.d/60-libvirtd.conf
 lib/systemd/system/libvirtd-admin.socket
 lib/systemd/system/libvirtd-ro.socket
@@ -23,10 +15,6 @@ lib/systemd/system/virtlockd.socket
 lib/systemd/system/virtlogd-admin.socket
 lib/systemd/system/virtlogd.service
 lib/systemd/system/virtlogd.socket
-lib/systemd/system/virtlxcd-admin.socket
-lib/systemd/system/virtlxcd-ro.socket
-lib/systemd/system/virtlxcd.service
-lib/systemd/system/virtlxcd.socket
 lib/systemd/system/virtnetworkd-admin.socket
 lib/systemd/system/virtnetworkd-ro.socket
 lib/systemd/system/virtnetworkd.service
@@ -41,10 +29,6 @@ lib/systemd/system/virtproxyd.service
 lib/systemd/system/virtproxyd.socket
 lib/systemd/system/virtproxyd-tcp.socket
 lib/systemd/system/virtproxyd-tls.socket
-lib/systemd/system/virtqemud-admin.socket
-lib/systemd/system/virtqemud-ro.socket
-lib/systemd/system/virtqemud.service
-lib/systemd/system/virtqemud.socket
 lib/systemd/system/virtsecretd-admin.socket
 lib/systemd/system/virtsecretd-ro.socket
 lib/systemd/system/virtsecretd.service
@@ -53,20 +37,9 @@ lib/systemd/system/virtstoraged-admin.socket
 lib/systemd/system/virtstoraged-ro.socket
 lib/systemd/system/virtstoraged.service
 lib/systemd/system/virtstoraged.socket
-lib/systemd/system/virtvboxd-admin.socket
-lib/systemd/system/virtvboxd-ro.socket
-lib/systemd/system/virtvboxd.service
-lib/systemd/system/virtvboxd.socket
-man/man1/virt-login-shell.1
-sbin/virtlxcd
 sbin/virtnwfilterd
-share/augeas/lenses/libvirtd_lxc.aug
-share/augeas/lenses/tests/test_libvirtd_lxc.aug
-share/augeas/lenses/tests/test_virtlxcd.aug
 share/augeas/lenses/tests/test_virtnwfilterd.aug
-share/augeas/lenses/virtlxcd.aug
 share/augeas/lenses/virtnwfilterd.aug
-share/examples/libvirt/lxc.conf
 share/examples/libvirt/nwfilter/allow-arp.xml
 share/examples/libvirt/nwfilter/allow-dhcp-server.xml
 share/examples/libvirt/nwfilter/allow-dhcp.xml
@@ -85,8 +58,6 @@ share/examples/libvirt/nwfilter/no-other-l2-traffic.xml
 share/examples/libvirt/nwfilter/no-other-rarp-traffic.xml
 share/examples/libvirt/nwfilter/qemu-announce-self-rarp.xml
 share/examples/libvirt/nwfilter/qemu-announce-self.xml
-share/examples/libvirt/virt-login-shell.conf
-share/examples/libvirt/virtlxcd.conf
 share/examples/libvirt/virtnwfilterd.conf
 share/examples/sysconfig/libvirtd
 share/examples/sysconfig/libvirt-guests
diff --git a/libvirt/TODO b/libvirt/TODO
index b871bd0d08..bd10861099 100644
--- a/libvirt/TODO
+++ b/libvirt/TODO
@@ -1,12 +1,7 @@
 - Seems to be unable to communicate with libvirtd via socket.
   (Maybe take a look at systemd scripts for comparison)
-
-- Builds backends depending on availability, e.g. on a Debian machine
-  with ZFS installed libvirt_storage_backend_zfs.la will be built, but
-  on a fresh install it will not. These things should probably be made
-  explicit with configure flags, possibily supporting options.mk.
-
+- Lots of --with-X=no, should have options.
 - Some files from PLIST missing on macOS.
-
 - _PATH_MOUNTED undefined in storage/storage_backend_fs.c with
   musl-libc.
+- PLIST mismatch on non-systemd Linux.
Prev by Date: libvirt: Always install systemd files on Linux
Next by Date: libvirt: Fixes for pkglint
Previous by Thread: libvirt: Always install systemd files on Linux
Next by Thread: libvirt: Fixes for pkglint
Indexes:
Home | Main Index | Thread Index | Old Index