| Message ID | 20220705200456.285943-1-quentin@isovalent.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 450a8dcb8c7f819431b09e5c1debbf0b6c2e824e |
| Delegated to: | BPF |
| Headers | show |
| Series | [bpf-next] bpftool: Remove zlib feature test from Makefile | expand |
Hello: This patch was applied to bpf/bpf-next.git (master) by Andrii Nakryiko <andrii@kernel.org>: On Tue, 5 Jul 2022 21:04:56 +0100 you wrote: > The feature test to detect the availability of zlib in bpftool's > Makefile does not bring much. The library is not optional: it may or may > not be required along libbfd for disassembling instructions, but in any > case it is necessary to build feature.o or even libbpf, on which bpftool > depends. > > If we remove the feature test, we lose the nicely formatted error > message, but we get a compiler error about "zlib.h: No such file or > directory", which is equally informative. Let's get rid of the test. > > [...] Here is the summary with links: - [bpf-next] bpftool: Remove zlib feature test from Makefile https://git.kernel.org/bpf/bpf-next/c/450a8dcb8c7f You are awesome, thank you!
diff --git a/tools/bpf/bpftool/Makefile b/tools/bpf/bpftool/Makefile index c19e0e4c41bd..e64b81e1c1ba 100644 --- a/tools/bpf/bpftool/Makefile +++ b/tools/bpf/bpftool/Makefile @@ -93,9 +93,9 @@ INSTALL ?= install RM ?= rm -f FEATURE_USER = .bpftool -FEATURE_TESTS = libbfd disassembler-four-args zlib libcap \ +FEATURE_TESTS = libbfd disassembler-four-args libcap \ clang-bpf-co-re -FEATURE_DISPLAY = libbfd disassembler-four-args zlib libcap \ +FEATURE_DISPLAY = libbfd disassembler-four-args libcap \ clang-bpf-co-re check_feat := 1 @@ -204,11 +204,6 @@ $(BOOTSTRAP_OUTPUT)disasm.o: $(srctree)/kernel/bpf/disasm.c $(OUTPUT)disasm.o: $(srctree)/kernel/bpf/disasm.c $(QUIET_CC)$(CC) $(CFLAGS) -c -MMD $< -o $@ -$(OUTPUT)feature.o: -ifneq ($(feature-zlib), 1) - $(error "No zlib found") -endif - $(BPFTOOL_BOOTSTRAP): $(BOOTSTRAP_OBJS) $(LIBBPF_BOOTSTRAP) $(QUIET_LINK)$(HOSTCC) $(HOST_CFLAGS) $(LDFLAGS) $(BOOTSTRAP_OBJS) $(LIBS_BOOTSTRAP) -o $@
The feature test to detect the availability of zlib in bpftool's Makefile does not bring much. The library is not optional: it may or may not be required along libbfd for disassembling instructions, but in any case it is necessary to build feature.o or even libbpf, on which bpftool depends. If we remove the feature test, we lose the nicely formatted error message, but we get a compiler error about "zlib.h: No such file or directory", which is equally informative. Let's get rid of the test. Suggested-by: Andrii Nakryiko <andrii@kernel.org> Signed-off-by: Quentin Monnet <quentin@isovalent.com> --- tools/bpf/bpftool/Makefile | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)