0001-libbpf-remove-feature-detection-BTF.patch 2.6 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980818283848586
  1. --- a/tools/lib/bpf/Makefile
  2. +++ b/tools/lib/bpf/Makefile
  3. @@ -59,28 +59,7 @@
  4. VERBOSE = 0
  5. endif
  6. -FEATURE_USER = .libbpf
  7. -FEATURE_TESTS = libelf zlib bpf
  8. -FEATURE_DISPLAY = libelf zlib bpf
  9. -
  10. INCLUDES = -I. -I$(srctree)/tools/include -I$(srctree)/tools/include/uapi
  11. -FEATURE_CHECK_CFLAGS-bpf = $(INCLUDES)
  12. -
  13. -check_feat := 1
  14. -NON_CHECK_FEAT_TARGETS := clean TAGS tags cscope help
  15. -ifdef MAKECMDGOALS
  16. -ifeq ($(filter-out $(NON_CHECK_FEAT_TARGETS),$(MAKECMDGOALS)),)
  17. - check_feat := 0
  18. -endif
  19. -endif
  20. -
  21. -ifeq ($(check_feat),1)
  22. -ifeq ($(FEATURES_DUMP),)
  23. -include $(srctree)/tools/build/Makefile.feature
  24. -else
  25. -include $(FEATURES_DUMP)
  26. -endif
  27. -endif
  28. export prefix libdir src obj
  29. @@ -157,7 +136,7 @@
  30. all_cmd: $(CMD_TARGETS) check
  31. -$(BPF_IN_SHARED): force elfdep zdep bpfdep $(BPF_HELPER_DEFS)
  32. +$(BPF_IN_SHARED): force $(BPF_HELPER_DEFS)
  33. @(test -f ../../include/uapi/linux/bpf.h -a -f ../../../include/uapi/linux/bpf.h && ( \
  34. (diff -B ../../include/uapi/linux/bpf.h ../../../include/uapi/linux/bpf.h >/dev/null) || \
  35. echo "Warning: Kernel ABI header at 'tools/include/uapi/linux/bpf.h' differs from latest version at 'include/uapi/linux/bpf.h'" >&2 )) || true
  36. @@ -175,7 +154,7 @@
  37. echo "Warning: Kernel ABI header at 'tools/include/uapi/linux/if_xdp.h' differs from latest version at 'include/uapi/linux/if_xdp.h'" >&2 )) || true
  38. $(Q)$(MAKE) $(build)=libbpf OUTPUT=$(SHARED_OBJDIR) CFLAGS="$(CFLAGS) $(SHLIB_FLAGS)"
  39. -$(BPF_IN_STATIC): force elfdep zdep bpfdep $(BPF_HELPER_DEFS)
  40. +$(BPF_IN_STATIC): force $(BPF_HELPER_DEFS)
  41. $(Q)$(MAKE) $(build)=libbpf OUTPUT=$(STATIC_OBJDIR)
  42. $(BPF_HELPER_DEFS): $(srctree)/tools/include/uapi/linux/bpf.h
  43. @@ -264,34 +243,16 @@
  44. install: install_lib install_pkgconfig install_headers
  45. -### Cleaning rules
  46. -
  47. -config-clean:
  48. - $(call QUIET_CLEAN, feature-detect)
  49. - $(Q)$(MAKE) -C $(srctree)/tools/build/feature/ clean >/dev/null
  50. -
  51. -clean: config-clean
  52. +clean:
  53. $(call QUIET_CLEAN, libbpf) $(RM) -rf $(CMD_TARGETS) \
  54. *~ .*.d .*.cmd LIBBPF-CFLAGS $(BPF_HELPER_DEFS) \
  55. $(SHARED_OBJDIR) $(STATIC_OBJDIR) \
  56. $(addprefix $(OUTPUT), \
  57. *.o *.a *.so *.so.$(LIBBPF_MAJOR_VERSION) *.pc)
  58. - $(call QUIET_CLEAN, core-gen) $(RM) $(OUTPUT)FEATURE-DUMP.libbpf
  59. -
  60. -
  61. -PHONY += force elfdep zdep bpfdep cscope tags
  62. +PHONY += force cscope tags
  63. force:
  64. -elfdep:
  65. - @if [ "$(feature-libelf)" != "1" ]; then echo "No libelf found"; exit 1 ; fi
  66. -
  67. -zdep:
  68. - @if [ "$(feature-zlib)" != "1" ]; then echo "No zlib found"; exit 1 ; fi
  69. -
  70. -bpfdep:
  71. - @if [ "$(feature-bpf)" != "1" ]; then echo "BPF API too old"; exit 1 ; fi
  72. -
  73. cscope:
  74. ls *.c *.h > cscope.files
  75. cscope -b -q -I $(srctree)/include -f cscope.out