diff options
| author | Tony Ambardar <itugrok@yahoo.com> | 2020-08-30 15:54:51 -0700 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2020-09-18 21:42:05 +0200 |
| commit | 5582fbd6135f7db4ba8bd887c360007f3b18dba1 (patch) | |
| tree | 49576d6af50edd835b974a74f1c80a5c07ea0d9b /package/network/utils/bpftools/Makefile | |
| parent | e826e007658911df91385935e74621889abbda24 (diff) | |
| download | upstream-5582fbd6135f7db4ba8bd887c360007f3b18dba1.tar.gz upstream-5582fbd6135f7db4ba8bd887c360007f3b18dba1.tar.bz2 upstream-5582fbd6135f7db4ba8bd887c360007f3b18dba1.zip | |
bpftools: support NLS, fix ppc build and update to 5.8.9
With global NLS support enabled (CONFIG_BUILD_NLS), the linked libelf.so
and libbfd.so libraries will depend on libintl.so. Import the nls.mk helper
to set library prefixes and flags accordingly, and also conditionally add
"-lintl" as link-time library.
Fix a build error on ppc due to a EDEADLOCK redefinition in errno.h.
Use upstream stable kernel 5.8.9, and fix overriding of feature detection
to only allow/hide detected features. Also refresh existing patches.
Fixes: 2f0d672088 ("bpftools: add utility and library packages supporting
eBPF usage")
Signed-off-by: Tony Ambardar <itugrok@yahoo.com>
Diffstat (limited to 'package/network/utils/bpftools/Makefile')
| -rw-r--r-- | package/network/utils/bpftools/Makefile | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/package/network/utils/bpftools/Makefile b/package/network/utils/bpftools/Makefile index 156dc8a4fa..e760d50c5e 100644 --- a/package/network/utils/bpftools/Makefile +++ b/package/network/utils/bpftools/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bpftools -PKG_VERSION:=5.8.3 +PKG_VERSION:=5.8.9 PKG_RELEASE:=1 PKG_SOURCE:=linux-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/linux/kernel/v5.x -PKG_HASH:=8ea27e1ed38981f772cc6d5f16ab8dbb8052c3800ba0494bd798fbb95dcc1779 +PKG_HASH:=99d8bc1b82f17d7d79f9af4a94af4c0e3772159e9e6e278761bde8569f93e15f PKG_MAINTAINER:=Tony Ambardar <itugrok@yahoo.com> @@ -32,6 +32,7 @@ TAR_OPTIONS+= \ $(addprefix $(LINUX_TLD)/,$(BPF_FILES)) include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/nls.mk define Package/bpftool/Default SECTION:=net @@ -92,6 +93,10 @@ ifneq ($(BUILD_VARIANT),lib) TARGET_LDFLAGS += -Wl,--gc-sections endif +ifneq ($(INTL_FULL),) + TARGET_LDFLAGS += -Wl,-lintl +endif + MAKE_FLAGS += \ EXTRA_CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \ LDFLAGS="$(TARGET_LDFLAGS)" \ @@ -125,9 +130,9 @@ define Build/Configure $(MAKE_FLAGS) FEATURES_DUMP= $(PKG_BUILD_DIR)//libbpf/libbpf.a (cd $(PKG_BUILD_DIR); cat FEATURE-DUMP.bpftool libbpf/FEATURE-DUMP.libbpf \ | sort | uniq > FEATURE-DUMP.openwrt) - $(SED) 's/feature-libbfd=[01]/feature-libbfd=$(HAVE_LIBBFD)/' \ - -e 's/feature-libcap=[01]/feature-libcap=$(HAVE_LIBCAP)/' \ - -e 's/feature-clang-bpf-global-var=[01]/feature-clang-bpf-global-var=$(HAVE_CLANG)/' \ + $(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)/' \ $(PKG_BUILD_DIR)/FEATURE-DUMP.openwrt endef |