From fe29f3551ada537aed9120e937ee751fa6f41567 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 5 Jan 2021 23:00:04 +0100 Subject: [PATCH] libvirt: use rpcsvc-proto unconditionally. --- srcpkgs/libvirt/template | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template index 09255adbda3..b4978fae705 100644 --- a/srcpkgs/libvirt/template +++ b/srcpkgs/libvirt/template @@ -1,11 +1,12 @@ # Template file for 'libvirt' pkgname=libvirt version=6.10.0 -revision=2 +revision=3 build_style=meson configure_args="-Dqemu_user=libvirt -Dqemu_group=libvirt -Drunstatedir=/run" -hostmakedepends="automake libtool perl pkg-config lvm2 parted gettext-devel - iptables libxslt docbook-xsl dnsmasq libapparmor-devel python3-docutils gettext" +hostmakedepends="automake dnsmasq docbook-xsl gettext gettext-devel iptables + libapparmor-devel libtool libxslt lvm2 parted perl pkg-config python3-docutils + rpcsvc-proto" makedepends="readline-devel libcap-ng-devel attr-devel gnutls-devel libsasl-devel libcurl-devel libpcap-devel libxml2-devel libparted-devel device-mapper-devel eudev-libudev-devel libblkid-devel libpciaccess-devel @@ -31,10 +32,7 @@ case "$XBPS_TARGET_MACHINE" in esac case "$XBPS_TARGET_MACHINE" in - *-musl) - CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/tirpc" - hostmakedepends+=" rpcsvc-proto" - ;; + *-musl) ;; *) # LTO apparently causes the linker to confuse the glibc symbol # xdr_int64_t with that provided by libtirpc, causing a crash.