diff options
| author | David Lönnhager <david.l@mullvad.net> | 2024-08-13 16:25:23 +0200 |
|---|---|---|
| committer | Markus Pettersson <markus.pettersson@mullvad.net> | 2024-08-14 10:51:41 +0200 |
| commit | ce5b989473dafef31adf51105041381227ab0ff3 (patch) | |
| tree | 4c3660402aa35e31ed482631836226f03aaf5cc3 | |
| parent | 368f5d34466124bbe3c768921c04193a3729464e (diff) | |
| download | mullvadvpn-ce5b989473dafef31adf51105041381227ab0ff3.tar.xz mullvadvpn-ce5b989473dafef31adf51105041381227ab0ff3.zip | |
Build `libpcap` without dbus
| -rw-r--r-- | test/scripts/Dockerfile | 18 | ||||
| -rw-r--r-- | test/test-manager/build.rs | 3 |
2 files changed, 20 insertions, 1 deletions
diff --git a/test/scripts/Dockerfile b/test/scripts/Dockerfile index 9e6fe20f80..bf2a08e90e 100644 --- a/test/scripts/Dockerfile +++ b/test/scripts/Dockerfile @@ -1,7 +1,23 @@ ARG IMAGE=ghcr.io/mullvad/mullvadvpn-app-build:latest FROM $IMAGE +ENV OPENSSL_STATIC=1 \ + OPENSSL_LIB_DIR=/usr/lib/x86_64-linux-gnu \ + OPENSSL_INCLUDE_DIR=/usr/include/openssl + RUN rustup target add x86_64-pc-windows-gnu RUN apt-get update && apt-get install -y \ - mtools pkg-config libssl-dev libpcap-dev + mtools pkg-config libssl-dev + +RUN git clone https://github.com/the-tcpdump-group/libpcap.git +RUN apt-get install -y autoconf flex bison + +RUN cd libpcap \ + && ./autogen.sh \ + && ./configure --enable-remote=yes --enable-dbus=no --enable-shared=no \ + && make \ + && make install + +RUN rm -rf libpcap +RUN apt-get remove -y autoconf flex bison diff --git a/test/test-manager/build.rs b/test/test-manager/build.rs index 37d4cac43b..da8241b224 100644 --- a/test/test-manager/build.rs +++ b/test/test-manager/build.rs @@ -1,4 +1,7 @@ fn main() { // Rebuild if SSH provision script changes println!("cargo::rerun-if-changed=../scripts/ssh-setup.sh"); + + println!("cargo::rustc-link-search=native=/usr/lib/x86_64-linux-gnu"); + println!("cargo::rustc-link-lib=static=pcap"); } |