qubes-vm-qrexec: fix build

qubes-vm-qrexec/APKBUILD

@@ -5,7 +5,7 @@ pkgname=qubes-vm-qrexec
 subpackages="$pkgname-openrc $pkgname-doc"
 pkgver=4.1.22
 _gittag="v$pkgver"
-pkgrel=0
+pkgrel=1
 pkgdesc="The Qubes qrexec files (qube side)"
 arch="x86_64"
 url="https://github.com/QubesOS/qubes-core-qrexec"
@@ -13,17 +13,18 @@ license='GPL'
 depends="qubes-libvchan-xen"
 options="!check" # No testsuite
 makedepends="
-	gcc
+	grep
 	make
+	lsb-release-minimal
 	pandoc
 	pkgconf
 	py3-setuptools
-	lld
 	qubes-libvchan-xen-dev
 	"
 source="
 	$pkgname-$_gittag.tar.gz::https://github.com/QubesOS/qubes-core-qrexec/archive/refs/tags/$_gittag.tar.gz
 	qubes-qrexec-agent.openrc
+	makefile-remove-cc-cflags.patch
 	agent-qrexec-fork-server-undef-fortify-source.patch
 	"
 builddir="$srcdir/qubes-core-qrexec-${_gittag/v}"
@@ -47,7 +48,6 @@ build() {
 }
 
 package() {
-	export LDFLAGS="$LDFLAGS -fuse-ld=lld"
 	make install-base DESTDIR="$pkgdir" SBINDIR=/sbin LIBDIR=/usr/lib SYSLIBDIR=/lib
 	make install-vm DESTDIR="$pkgdir" SBINDIR=/sbin LIBDIR=/usr/lib SYSLIBDIR=/lib
 	install -Dm 755 "$srcdir"/qubes-qrexec-agent.openrc "$pkgdir"/etc/init.d/qubes-qrexec-agent
@@ -55,5 +55,6 @@ package() {
 sha512sums="
 c4d993dae87446fe73f390bdf0aa3bcfacce1a630b1f0e5f20c6ea7710c14cd9a7a0a66a66e5731dee47c6958c659e61b3c0ebea5a99a31317a52fb326650a2f  qubes-vm-qrexec-v4.1.22.tar.gz
 e2dd5cace82e881c40d5d37c69f7327fbabde81c9d23283de23de9f1197b7b018ef07a8d90e95c61bd249426d9d8297e7cb372333245941ffa0682c90ea3461f  qubes-qrexec-agent.openrc
+e48a06778a880915827fb2ef3e38379eb2bc6cf63f7fed79472be4732f7110b0c642c7a62a43236f53404ce69afddd40a5bc92a984403aae74caae1580c31200  makefile-remove-cc-cflags.patch
 69b88c8d344f0d575eac398937040ba39a0d8fb8ea0a2b160c48d84775e1da4e226a76f3c5d3be7b045f577b634bb35cd5c5536248e18117c4121a38f9f3bf13  agent-qrexec-fork-server-undef-fortify-source.patch
 "

qubes-vm-qrexec/makefile-remove-cc-cflags.patch

@@ -0,0 +1,35 @@
+diff --git a/Makefile.orig b/Makefile
+index ade10bf..7de05a4 100644
+--- a/Makefile.orig
++++ b/Makefile
+@@ -26,7 +24,7 @@ all-base:
+ 	$(PYTHON) setup.py build
+ .PHONY: all-base
+ 
+-install-base: all-base
++install-base:
+ 	+$(MAKE) install -C libqrexec
+ 	$(PYTHON) setup.py install -O1 $(PYTHON_PREFIX_ARG) --skip-build --root $(DESTDIR)
+ 	ln -sf qrexec-policy-exec $(DESTDIR)/usr/bin/qrexec-policy
+@@ -75,7 +73,7 @@ all-vm-selinux:
+ 	+$(MAKE) -f /usr/share/selinux/devel/Makefile -C selinux qubes-core-qrexec.pp
+ .PHONY: all-vm
+ 
+-install-vm: all-vm
++install-vm:
+ 	+$(MAKE) install -C agent
+ 	install -d $(DESTDIR)/$(SYSLIBDIR)/systemd/system -m 755
+ 	install -t $(DESTDIR)/$(SYSLIBDIR)/systemd/system -m 644 systemd/qubes-qrexec-agent.service
+diff --git a/agent/Makefile.orig b/agent/Makefile
+index e1500f1..d75f60e 100644
+--- a/agent/Makefile.orig
++++ b/agent/Makefile
+@@ -32,7 +32,7 @@ else
+ endif
+ 
+ 
+-install: all
++install:
+ 	install -d $(DESTDIR)/etc/qubes-rpc $(DESTDIR)/usr/lib/qubes \
+ 		$(DESTDIR)/usr/bin $(DESTDIR)/usr/share/man/man1
+ 	install qrexec-agent $(DESTDIR)/usr/lib/qubes