Makefile.in: Use a local libpcap in the releasecheck target

This may avoid errors in make check, depending on the system's libpcap
version.

Update the Cirrus CI configuration, linux_task, accordingly.

(cherry picked from commit 0546e6a33a)
This commit is contained in:
Francois-Xavier Le Bail 2024-09-25 20:30:12 +02:00
parent 4aef07406d
commit c546a7cc5c
2 changed files with 21 additions and 0 deletions

View File

@ -38,6 +38,7 @@ linux_task:
script:
- apt-get -qy update >/dev/null
- apt-get -qy install autoconf make gcc libpcap-dev >/dev/null # for "./configure"
- apt-get -qy install flex bison libdbus-1-dev libbluetooth-dev libnl-genl-3-dev libibverbs-dev >/dev/null # for libpcap
- apt-get -qy install cmake git binutils-dev >/dev/null # for "make releasecheck"
- apt-get -qy install shellcheck >/dev/null
- ./autogen.sh

View File

@ -516,6 +516,22 @@ releasecheck: releasetar
INSTALL_DIR=/tmp/install_"$$TAG"_$$$$ && \
DIR=`pwd` && \
cd /tmp && \
rm -rf libpcap && \
rm -rf install_libpcap && \
echo "[$@] $$ git clone [...] libpcap.git" && \
git clone --depth 3 --quiet https://github.com/the-tcpdump-group/libpcap.git && \
echo "[$@] $$ cd libpcap" && \
cd libpcap && \
echo "[$@] $$ ./autogen.sh" && \
./autogen.sh && \
echo "[$@] $$ ./configure --quiet --prefix=/tmp/install_libpcap" && \
./configure --quiet --prefix=/tmp/install_libpcap && \
echo "[$@] $$ make -s " && \
make -s && \
echo "[$@] $$ make -s install" && \
make -s install && \
echo "[$@] $$ cd .." && \
cd .. && \
rm -rf "$$TAG" && \
rm -rf "$$INSTALL_DIR" && \
tar xf "$$DIR"/"$$TAG".tar.gz && \
@ -537,6 +553,8 @@ releasecheck: releasetar
touch .devel && \
mkdir build && \
cd build && \
echo "[$@] $$ export PKG_CONFIG_PATH=/tmp/install_libpcap/lib/pkgconfig" && \
export PKG_CONFIG_PATH=/tmp/install_libpcap/lib/pkgconfig && \
echo '[$@] $$ cmake -DENABLE_SMB=yes [...] ..' && \
cmake -DENABLE_SMB=yes \
-DCMAKE_INSTALL_PREFIX="$$INSTALL_DIR" \
@ -551,6 +569,8 @@ releasecheck: releasetar
cd ../.. && \
rm -rf "$$TAG" && \
rm -rf "$$INSTALL_DIR" && \
rm -rf install_libpcap && \
rm -rf libpcap && \
echo '[$@] Done.'
whitespacecheck: