bpftools: fix feature override for masking clang
authorTony Ambardar <itugrok@yahoo.com>
Mon, 12 Apr 2021 23:46:22 +0000 (16:46 -0700)
committerHauke Mehrtens <hauke@hauke-m.de>
Mon, 11 Apr 2022 20:51:57 +0000 (22:51 +0200)
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@yahoo.com>
(cherry picked from commit cf20f1bb5f0479c2509dd651d08e235a3b9e8755)

package/network/utils/bpftools/Makefile

index 82eb34e2dc284d28c403f6f28fd2cd6edd4e63c1..e5e5c440fc9d28f238e0ad9891094212c42d05e6 100644 (file)
@@ -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