From: Tony Ambardar Date: Mon, 12 Apr 2021 23:46:22 +0000 (-0700) Subject: bpftools: fix feature override for masking clang X-Git-Tag: v22.03.0-rc1~2712 X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=cf20f1bb5f0479c2509dd651d08e235a3b9e8755;p=openwrt%2Fopenwrt.git 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 --- diff --git a/package/network/utils/bpftools/Makefile b/package/network/utils/bpftools/Makefile index 9955d361f4..52963e4148 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