<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/50f6b87e76adfc829c92802d3ec8b91aab53ca8c">https://github.com/macports/macports-ports/commit/50f6b87e76adfc829c92802d3ec8b91aab53ca8c</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 50f6b87e76adfc829c92802d3ec8b91aab53ca8c
</span>Author: Pavel Hrdina <phrdina@redhat.com>
AuthorDate: Tue Feb 16 14:53:49 2021 +0100
<span style='display:block; white-space:pre;color:#404040;'> libvirt: Update to 7.0.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Upstream libvirt switched to meson in version 6.7.0 so the update
</span><span style='display:block; white-space:pre;color:#404040;'> requires a bit more changes.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The main difference is that with meson we cannot override specific
</span><span style='display:block; white-space:pre;color:#404040;'> binaries like we could with autoconf using ac_cv_path_* so we will
</span><span style='display:block; white-space:pre;color:#404040;'> patch meson.build file to look for correct binaries.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Some of the options were not converted to meson:
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> --with-driver-modules - it was not possible to disable even with
</span><span style='display:block; white-space:pre;color:#404040;'> autoconf
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Some of the options were dropped between 6.6.0 and 6.7.0:
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> --without-hal - the HAL support was completely dropped (6.8.0)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> --without-dbus - libdbus was replaced by glib2 dbus (6.8.0)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> --without-virtualport - the code is compiled only on linux (6.9.0)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> --without-macvtap - the code is compiled only on linux if libnl
</span><span style='display:block; white-space:pre;color:#404040;'> is available (6.9.0)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
</span>---
sysutils/libvirt/Portfile | 143 ++++++++++++++------------------
sysutils/libvirt/files/patch-meson.diff | 11 +++
2 files changed, 73 insertions(+), 81 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/libvirt/Portfile b/sysutils/libvirt/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d0bd5843f2f..e4275c479a4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/libvirt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/libvirt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,17 +3,18 @@
</span> PortSystem 1.0
PortGroup compiler_blacklist_versions 1.0
PortGroup legacysupport 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup meson 1.0
</span>
# O_CLOEXEC
legacysupport.newest_darwin_requires_legacy 10
# Remember to update libvirt and py-libvirt at the same time.
name libvirt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 6.6.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 7.0.0
</span> revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 72294aa39f53386cfcd8812ddf243bd7aa9ee29c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 94e52ddd2d71b650e1a7eb5ab7e651f9607ecee207891216714020b8ff081ef9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 9305836
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 1601c5f6ef46b048968c88a0bbb534ac95723caa \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 ca3833844d08c22867f1d1a46edc36bda7d6fe1a4f267e7d77100b79fc9ddd89 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 8567648
</span>
categories sysutils
license LGPL-2.1+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,13 +30,14 @@ homepage https://libvirt.org
</span> master_sites ${homepage}/sources/
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:autoconf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:automake \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_version 39
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_branch 3.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span> port:bash-completion \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libtool \
</span> port:pkgconfig \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python38 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py38-docutils \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python${python_version} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python_version}-docutils \
</span> port:perl5
depends_lib port:curl \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,97 +52,76 @@ depends_lib port:curl \
</span> # error: You need at least XCode Clang v5.1 to compile QEMU
compiler.blacklist-append apple-gcc* gcc-3.3 *gcc-4.* macports-clang-3.3 {clang < 503}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-meson.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # libvirt build scripts require python 3.x
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.python ${prefix}/bin/python3.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.python ${prefix}/bin/python${python_branch}
</span> configure.perl ${prefix}/bin/perl5
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args ac_cv_path_RST2HTML=${prefix}/bin/rst2html-3.8.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_cv_path_RST2MAN=${prefix}/bin/rst2man-3.8.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-silent-rules \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-debug \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-apparmor \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-attr \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-audit \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-bash-completion \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-bash-completions-dir=${prefix}/share/bash-completion/completions \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-bhyve \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-blkid \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-capng \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-curl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-dbus \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-driver-modules \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-dtrace \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-esx \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-fuse \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-glusterfs \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-hal \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-hyperv \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-init-script=none \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-libpcap \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-libssh \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-libvirtd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-libxl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-lxc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-macvtap \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-netcf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-network \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-numactl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-openvz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-openwsman \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-pm-utils \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-polkit \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-qemu \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-readline \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-remote \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-sanlock \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-sasl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-secrets \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-selinux \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-ssh2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-sysctl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-test \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-udev \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-vbox \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-virtualport \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-vmware \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-vz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-wireshark-dissector \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-yajl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# As of 5.10.0, an out-of-source build is required.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cmd ../${worksrcdir}/autogen.sh --no-git
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.dir ${workpath}/build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.dir ${configure.dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file mkdir ${configure.dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env PATH=${frameworks_dir}/Python.framework/Versions/${python_branch}/bin:$env(PATH)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args -Dapparmor=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dattr=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Daudit=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dbash_completion=enabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dbash_completion_dir=${prefix}/share/bash-completion/completions \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dblkid=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dcapng=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dcurl=enabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Ddriver_bhyve=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Ddriver_esx=enabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Ddriver_hyperv=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Ddriver_libvirtd=enabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Ddriver_libxl=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Ddriver_lxc=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Ddriver_network=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Ddriver_openvz=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Ddriver_qemu=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Ddriver_remote=enabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Ddriver_secrets=enabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Ddriver_test=enabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Ddriver_vbox=enabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Ddriver_vmware=enabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Ddriver_vz=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Ddtrace=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dfuse=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dglusterfs=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dinit_script=none \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dlibpcap=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dlibssh=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dlibssh2=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dnetcf=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dnumactl=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dopenwsman=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dpm_utils=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dpolkit=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dreadline=enabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dsanlock=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dsasl=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dselinux=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dsysctl_config=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dudev=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dwireshark_dissector=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dyajl=enabled
</span>
# As of 5.10.0, pregenerated files are no longer included in the tarball,
# and rpcgen on OS X 10.11 and earlier is not able to generate them; see:
# https://bugzilla.redhat.com/show_bug.cgi?id=1785575
depends_build-append \
port:rpcgen-mt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_cv_path_RPCGEN=${prefix}/bin/rpcgen-mt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# As of 5.10.0, disabling dependency tracking causes build failure; see:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://bugzilla.redhat.com/show_bug.cgi?id=1783626
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Upstream will not fix this; instead, they will switch to meson.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.universal_args-delete --disable-dependency-tracking
</span>
variant fuse description {FUSE support} {
depends_lib-append port:osxfuse
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --without-fuse --with-fuse
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -Dfuse=disabled -Dfuse=enabled
</span> }
variant libssh2 description {Enable the libssh2 transport} {
depends_lib-append port:libssh2
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --without-ssh2 --with-ssh2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -Dlibssh2=disabled -Dlibssh2=enabled
</span> }
variant sasl description {Use Cyrus SASL for authentication} {
depends_lib-append port:cyrus-sasl2
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --without-sasl --with-sasl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -Dsasl=disabled -Dsasl=enabled
</span> }
notes "
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/libvirt/files/patch-meson.diff b/sysutils/libvirt/files/patch-meson.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..aa9df2147f1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/libvirt/files/patch-meson.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -892,7 +892,7 @@ required_programs = [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ required_programs_groups = [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {'name':'rpcgen', 'prog':['rpcgen', 'portable-rpcgen']},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {'name':'rpcgen', 'prog':['rpcgen-mt', 'rpcgen', 'portable-rpcgen']},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {'name':'rst2html', 'prog':['rst2html5', 'rst2html5.py', 'rst2html5-3']},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {'name':'rst2man', 'prog':['rst2man', 'rst2man.py', 'rst2man-3']},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ]
</span></pre><pre style='margin:0'>
</pre>