diff options
| author | Tony Ambardar <itugrok@yahoo.com> | 2021-04-12 16:46:22 -0700 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-04-11 22:51:57 +0200 |
| commit | 91323444444d2c60b81ec5ba064c21609db83a84 (patch) | |
| tree | cdd5d2615eba3d1c22c541233051bb5afed0fa1f | |
| parent | 169c9e3a88b7d4521a797864540657ef33554663 (diff) | |
| download | upstream-91323444444d2c60b81ec5ba064c21609db83a84.tar.gz upstream-91323444444d2c60b81ec5ba064c21609db83a84.tar.bz2 upstream-91323444444d2c60b81ec5ba064c21609db83a84.zip | |
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@yahoo.com>
(cherry picked from commit cf20f1bb5f0479c2509dd651d08e235a3b9e8755)
| -rw-r--r-- | package/network/utils/bpftools/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
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 |