From 086fa6a7a140862bd3164637f0c79a6bdd256b5e Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 5 Jan 2021 22:40:39 +0100 Subject: [PATCH 1/3] xorg-server: unconditionally use libtirpc. --- srcpkgs/xorg-server/template | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template index 5e48034444e..06f51d611e8 100644 --- a/srcpkgs/xorg-server/template +++ b/srcpkgs/xorg-server/template @@ -1,7 +1,7 @@ # Template file for 'xorg-server' pkgname=xorg-server version=1.20.10 -revision=2 +revision=3 build_style=meson configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true -Dxvfb=true -Dhal=false -Dudev=true -Dxkb_dir=/usr/share/X11/xkb @@ -13,7 +13,7 @@ configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true hostmakedepends="pkg-config wayland-devel xkbcomp flex" makedepends="MesaLib-devel libXaw-devel libXfont-devel libXfont2-devel libXrender-devel libXres-devel libXtst-devel libXv-devel libXxf86dga-devel - libdmx-devel libepoxy-devel libressl-devel libxkbfile-devel + libdmx-devel libepoxy-devel libressl-devel libtirpc-devel libxkbfile-devel libxkbui-devel pixman-devel wayland-devel wayland-protocols xcb-util-image-devel xcb-util-keysyms-devel xcb-util-renderutil-devel xcb-util-wm-devel xkbcomp nettle-devel $(vopt_if elogind 'dbus-devel')" @@ -41,12 +41,6 @@ case "$XBPS_TARGET_MACHINE" in *) configure_args+=" -Dint10=false -Dvbe=false" ;; esac -case "$XBPS_TARGET_MACHINE" in - *-musl) - # required when secure_rpc is enabled and not using glibc for rpc/rpc.h - makedepends+=" libtirpc-devel" ;; -esac - # gcc10 needs to be hinted when symbols have multiple definitions CFLAGS="-fcommon" From 03062286761d5635288512d2019a0892b0d82718 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 5 Jan 2021 22:46:26 +0100 Subject: [PATCH 2/3] conntrack-tools: unconditionally use libtirpc. --- srcpkgs/conntrack-tools/template | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/srcpkgs/conntrack-tools/template b/srcpkgs/conntrack-tools/template index 40314c29acb..2d0773538fb 100644 --- a/srcpkgs/conntrack-tools/template +++ b/srcpkgs/conntrack-tools/template @@ -1,20 +1,15 @@ # Template file for 'conntrack-tools' pkgname=conntrack-tools version=1.4.6 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="pkg-config flex" -makedepends="libnfnetlink-devel libnetfilter_conntrack-devel libnetfilter_cttimeout-devel libnetfilter_cthelper-devel libnetfilter_queue-devel libmnl-devel" +makedepends="libmnl-devel libnetfilter_conntrack-devel + libnetfilter_cthelper-devel libnetfilter_cttimeout-devel + libnetfilter_queue-devel libnfnetlink-devel libtirpc-devel" short_desc="Tools to interact with the netfilter connection tracking system" maintainer="Anthony Iliopoulos " license="GPL-2.0-or-later" homepage="http://conntrack-tools.netfilter.org/" distfiles="http://www.netfilter.org/projects/conntrack-tools/files/conntrack-tools-${version}.tar.bz2" checksum=590859cc848245dbfd9c6487761dd303b3a1771e007f4f42213063ca56205d5f - -case "$XBPS_TARGET_MACHINE" in - *-musl) makedepends+=" libtirpc-devel" - CFLAGS="-D_GNU_SOURCE -I${XBPS_CROSS_BASE}/usr/include/tirpc" - LDFLAGS="-ltirpc" - ;; -esac From bffe69a06033e1e802934d1009d7ab461b2ce163 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 5 Jan 2021 23:00:04 +0100 Subject: [PATCH 3/3] 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.