[openwrt/openwrt] bpftools: fix feature override for masking clang

LEDE Commits lede-commits at lists.infradead.org
Mon Apr 11 14:12:30 PDT 2022


hauke pushed a commit to openwrt/openwrt.git, branch openwrt-21.02:
https://git.openwrt.org/91323444444d2c60b81ec5ba064c21609db83a84

commit 91323444444d2c60b81ec5ba064c21609db83a84
Author: Tony Ambardar <itugrok at yahoo.com>
AuthorDate: Mon Apr 12 16:46:22 2021 -0700

    bpftools: fix feature override for masking clang
    
    Rename feature variable clang-bpf-global-var following upstream changes.
    This restores the HAVE_CLANG feature override and should avoid rare build
    errors where a recent host clang and BTF-enabled host kernel are present.
    
    Fixes: 23be333401f0 ("bpftools: update to 5.10.10")
    Signed-off-by: Tony Ambardar <itugrok at yahoo.com>
    (cherry picked from commit cf20f1bb5f0479c2509dd651d08e235a3b9e8755)
---
 package/network/utils/bpftools/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/network/utils/bpftools/Makefile b/package/network/utils/bpftools/Makefile
index 82eb34e2dc..e5e5c440fc 100644
--- a/package/network/utils/bpftools/Makefile
+++ b/package/network/utils/bpftools/Makefile
@@ -128,7 +128,7 @@ define Build/Configure
 		| sort | uniq > FEATURE-DUMP.openwrt)
 	$(SED) 's/feature-libbfd=1/feature-libbfd=$(HAVE_LIBBFD)/' \
 		-e 's/feature-libcap=1/feature-libcap=$(HAVE_LIBCAP)/' \
-		-e 's/feature-clang-bpf-global-var=1/feature-clang-bpf-global-var=$(HAVE_CLANG)/' \
+		-e 's/feature-clang-bpf-co-re=1/feature-clang-bpf-co-re=$(HAVE_CLANG)/' \
 		$(PKG_BUILD_DIR)/FEATURE-DUMP.openwrt
 endef
 




More information about the lede-commits mailing list