From: Sergey Matveev <stargrave@stargrave.org>
Date: Sat, 22 Jun 2024 20:18:26 +0000 (+0300)
Subject: tshark requires c-ares
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=7d89285086c719e6419da34b82e30220cf819af8e99f1e16355e51051276271c;p=bass.git

tshark requires c-ares
---

diff --git a/build/skel/net/tshark-4.2.5.do b/build/skel/net/tshark-4.2.5.do
index d3e2c05..0957f52 100644
--- a/build/skel/net/tshark-4.2.5.do
+++ b/build/skel/net/tshark-4.2.5.do
@@ -10,11 +10,12 @@ devel/gmake-4.4.1
 devel/pkgconf-2.1.1
 devel/cmake-3.28.3
 "
+rdeps=dns/c-ares-1.30.0
 ver=${NAME#tshark-}
-redo-ifchange $bdeps "$DISTFILES"/wireshark-$ver.tar.xz
+redo-ifchange $bdeps "$DISTFILES"/wireshark-$ver.tar.xz $rdeps
 hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH)
 . "$BASS_ROOT"/build/lib/create-tmp-for-build.rc
-"$BASS_ROOT"/build/bin/pkg-inst $bdeps
+"$BASS_ROOT"/build/bin/pkg-inst $bdeps $rdeps
 . ./rc
 $TAR xf "$DISTFILES"/wireshark-$ver.tar.xz
 "$BASS_ROOT"/bin/rm-r "$SKELBINS"/$ARCH/$NAME-$hsh
@@ -34,9 +35,12 @@ cmake -DCMAKE_INSTALL_PREFIX="$SKELBINS"/$ARCH/$NAME-$hsh \
     -DBUILD_randpkt=OFF \
     -DBUILD_dumpcap=OFF \
     -DBUILD_rawshark=OFF \
+    -DCARES_INCLUDE_DIR=$tmp/local/include \
+    -DCARES_LIBRARY=$tmp/local/lib/libcares.so \
     .. >&2
 gmake -j$MAKE_JOBS >&2
 gmake install >&2
 
 cd "$SKELBINS"/$ARCH
+"$BASS_ROOT"/build/lib/prepare-preinst-010-rdeps $NAME-$hsh $rdeps
 "$BASS_ROOT"/build/lib/mk-pkg $NAME-$hsh