bcc: update to 0.28.0.
This commit is contained in:
parent
b3c4665418
commit
855a72b61f
@ -1,43 +0,0 @@
|
|||||||
From 950cffc0366981d4e41b08f007b37bd6af931f25 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Jesus Sanchez-Palencia <jesussanp@google.com>
|
|
||||||
Date: Wed, 8 Mar 2023 16:48:36 -0800
|
|
||||||
Subject: [PATCH] libbpf: Revert poisoning of strlcpy
|
|
||||||
|
|
||||||
This reverts commit 6d0c4b11e743("libbpf: Poison strlcpy()").
|
|
||||||
|
|
||||||
It added the pragma poison directive to libbpf_internal.h to protect
|
|
||||||
against accidental usage of strlcpy but ended up breaking the build for
|
|
||||||
toolchains based on libcs which provide the strlcpy() declaration from
|
|
||||||
string.h (e.g. uClibc-ng). The include order which causes the issue is:
|
|
||||||
|
|
||||||
string.h,
|
|
||||||
from Iibbpf_common.h:12,
|
|
||||||
from libbpf.h:20,
|
|
||||||
from libbpf_internal.h:26,
|
|
||||||
from strset.c:9:
|
|
||||||
|
|
||||||
Fixes: 6d0c4b11e743 ("libbpf: Poison strlcpy()")
|
|
||||||
Signed-off-by: Jesus Sanchez-Palencia <jesussanp@google.com>
|
|
||||||
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
|
|
||||||
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
|
|
||||||
Link: https://lore.kernel.org/bpf/20230309004836.2808610-1-jesussanp@google.com
|
|
||||||
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
|
|
||||||
---
|
|
||||||
src/libbpf_internal.h | 4 ++--
|
|
||||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/libbpf_internal.h b/src/libbpf_internal.h
|
|
||||||
index fbaf68335..e4d05662a 100644
|
|
||||||
--- a/src/cc/libbpf/src/libbpf_internal.h
|
|
||||||
+++ b/src/cc/libbpf/src/libbpf_internal.h
|
|
||||||
@@ -20,8 +20,8 @@
|
|
||||||
/* make sure libbpf doesn't use kernel-only integer typedefs */
|
|
||||||
#pragma GCC poison u8 u16 u32 u64 s8 s16 s32 s64
|
|
||||||
|
|
||||||
-/* prevent accidental re-addition of reallocarray()/strlcpy() */
|
|
||||||
-#pragma GCC poison reallocarray strlcpy
|
|
||||||
+/* prevent accidental re-addition of reallocarray() */
|
|
||||||
+#pragma GCC poison reallocarray
|
|
||||||
|
|
||||||
#include "libbpf.h"
|
|
||||||
#include "btf.h"
|
|
@ -1,6 +1,6 @@
|
|||||||
# Template file for 'bcc'
|
# Template file for 'bcc'
|
||||||
pkgname=bcc
|
pkgname=bcc
|
||||||
version=0.27.0
|
version=0.28.0
|
||||||
revision=1
|
revision=1
|
||||||
build_style=cmake
|
build_style=cmake
|
||||||
configure_args="-DREVISION=${version} -DENABLE_LLVM_SHARED=1"
|
configure_args="-DREVISION=${version} -DENABLE_LLVM_SHARED=1"
|
||||||
@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
|
|||||||
license="Apache-2.0"
|
license="Apache-2.0"
|
||||||
homepage="https://github.com/iovisor/bcc"
|
homepage="https://github.com/iovisor/bcc"
|
||||||
distfiles="https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz>bcc-${version}.tar.gz"
|
distfiles="https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz>bcc-${version}.tar.gz"
|
||||||
checksum=157208df3c8c0473b5dbedd57648fb98b5d07e5565984affc4e3e84a3df601bc
|
checksum=65adcaf4cee17fa3a94d0bb96d3691ca7e5864244e7bd52df93f7ae6c004f23d
|
||||||
python_version="3"
|
python_version="3"
|
||||||
|
|
||||||
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
|
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
|
||||||
|
Loading…
x
Reference in New Issue
Block a user