Refactor reverse proxy configuration to include libbpf-dev and bpf_st…

…atic dependencies
arloor · Oct 22, 2024 · 779a9ec · 779a9ec
1 parent ef71fbe
commit 779a9ec
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -75,10 +75,10 @@ jobs:
           use_musl: false
           extra_deps: cmake zlib1g-dev libelf-dev pkg-config clang autoconf autopoint flex bison gawk make libbpf-dev
           after_install: |
-            ls -lh /usr/lib/x86_64-linux-gnu/libelf.a
+            # ls -lh /usr/lib/x86_64-linux-gnu/libelf.a
             export LIBBPF_SYS_LIBRARY_PATH=/usr/lib/x86_64-linux-gnu
-            echo \$LIBBPF_SYS_LIBRARY_PATH
-          args: -p rust_http_proxy --no-default-features --features aws_lc_rs,bpf_vendored
+            echo LIBBPF_SYS_LIBRARY_PATH=$LIBBPF_SYS_LIBRARY_PATH
+          args: -p rust_http_proxy --no-default-features --features aws_lc_rs,bpf_static -v
           apt_mirror: mirrors.mit.edu
           rust_flags: -C target-feature=+crt-static
           debug: false

diff --git a/rust_http_proxy/Cargo.toml b/rust_http_proxy/Cargo.toml
@@ -61,11 +61,6 @@ default = ["ring"]
 jemalloc = ["jemallocator"]
 bpf = ["socket_filter", "cgroup_traffic"]
 bpf_vendored = ["bpf", "libbpf-sys/vendored"]
-bpf_static = [
-    "bpf",
-    "libbpf-sys/static-zlib",
-    "libbpf-sys/static-libelf",
-    "libbpf-sys/static-libbpf",
-]
+bpf_static = ["bpf", "libbpf-sys/static"]
 aws_lc_rs = ["tokio-rustls/aws-lc-rs", "hyper-rustls/aws-lc-rs"]
 ring = ["tokio-rustls/ring", "hyper-rustls/ring"]