From 91f0229c5633408918b896d316b51ab3ba479202 Mon Sep 17 00:00:00 2001 From: remittor Date: Tue, 6 May 2025 11:48:09 +0300 Subject: [PATCH] xmake: Fix build podkop (remove conflicts) --- xmake.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/xmake.sh b/xmake.sh index 67199e4..bea5fc7 100755 --- a/xmake.sh +++ b/xmake.sh @@ -130,6 +130,7 @@ function build_target { PODKOP_MK=$XDIR/package/feeds/_podkop/podkop/Makefile if [ -f $PODKOP_MK ]; then sed -i 's/+sing-box / /g' $PODKOP_MK + sed -i 's/CONFLICTS:=.*/CONFLICTS:=/g' $PODKOP_MK fi PODKOP_SH=$XDIR/package/feeds/_podkop/podkop/files/usr/bin/podkop if [ -f $PODKOP_SH ] && ! grep -q '(which sing-box)' $PODKOP_SH ; then