mirror/libbpf
1
0
Fork 0
mirror of https://github.com/netdata/libbpf.git synced 2026-04-06 00:29:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

ci: fix Debian builds due to pkg-config dependency change

Browse Source 
Seems like we need pkgconfig dependency instead of pkg-config.

Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
This commit is contained in:
Andrii Nakryiko
2022-11-16 09:32:31 -08:00
committed by Andrii Nakryiko
parent 3b6093fd43
commit c80f12f7f6
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ci/managers/debian.sh
View File

@@ -6,7 +6,7 @@ CONT_NAME="${CONT_NAME:-libbpf-debian-$DEBIAN_RELEASE}"
ENV_VARS="${ENV_VARS:-}" ENV_VARS="${ENV_VARS:-}"
DOCKER_RUN="${DOCKER_RUN:-docker run}" DOCKER_RUN="${DOCKER_RUN:-docker run}"
REPO_ROOT="${REPO_ROOT:-$PWD}" REPO_ROOT="${REPO_ROOT:-$PWD}"
ADDITIONAL_DEPS=(clang pkg-config gcc-10) ADDITIONAL_DEPS=(clang pkgconf gcc-10)
EXTRA_CFLAGS="" EXTRA_CFLAGS=""
EXTRA_LDFLAGS="" EXTRA_LDFLAGS=""
@@ -43,8 +43,7 @@ for phase in "${PHASES[@]}"; do
docker_exec bash -c "echo deb-src http://deb.debian.org/debian $DEBIAN_RELEASE main >>/etc/apt/sources.list" docker_exec bash -c "echo deb-src http://deb.debian.org/debian $DEBIAN_RELEASE main >>/etc/apt/sources.list"
docker_exec apt-get -y update docker_exec apt-get -y update
docker_exec apt-get -y install aptitude docker_exec apt-get -y install aptitude
docker_exec aptitude -y build-dep libelf-dev docker_exec aptitude -y install make libz-dev libelf-dev
docker_exec aptitude -y install libelf-dev
docker_exec aptitude -y install "${ADDITIONAL_DEPS[@]}" docker_exec aptitude -y install "${ADDITIONAL_DEPS[@]}"
echo -e "::endgroup::" echo -e "::endgroup::"
;; ;;
@@ -56,8 +55,6 @@ for phase in "${PHASES[@]}"; do
elif [[ "$phase" = *"GCC10"* ]]; then elif [[ "$phase" = *"GCC10"* ]]; then
ENV_VARS="-e CC=gcc-10 -e CXX=g++-10" ENV_VARS="-e CC=gcc-10 -e CXX=g++-10"
CC="gcc-10" CC="gcc-10"
else
EXTRA_CFLAGS="${EXTRA_CFLAGS} -Wno-stringop-truncation"
fi fi
if [[ "$phase" = *"ASAN"* ]]; then if [[ "$phase" = *"ASAN"* ]]; then
EXTRA_CFLAGS="${EXTRA_CFLAGS} -fsanitize=address,undefined" EXTRA_CFLAGS="${EXTRA_CFLAGS} -fsanitize=address,undefined"