diff --git a/dpdkbuild/Makefile b/dpdkbuild/Makefile index 3b3ab642c..1231fb3a7 100644 --- a/dpdkbuild/Makefile +++ b/dpdkbuild/Makefile @@ -187,12 +187,12 @@ $(SPDK_ROOT_DIR)/dpdk/build-tmp: $(SPDK_ROOT_DIR)/mk/cc.mk $(SPDK_ROOT_DIR)/incl $(Q)cd "$(SPDK_ROOT_DIR)/dpdk"; CC="$(SUB_CC)" meson --prefix="$(MESON_PREFIX)" --libdir lib -Dc_args="$(DPDK_CFLAGS)" -Dc_link_args="$(DPDK_LDFLAGS)" $(DPDK_OPTS) -Denable_drivers="$(shell echo $(DPDK_DRIVERS) | sed -E "s/ +/,/g")" -Ddisable_libs="$(shell echo $(DPDK_DISABLED_LIBS) | sed -E "s/ +/,/g")" build-tmp $(Q)sed $(SED_INPLACE_FLAG) 's/#define RTE_EAL_PMD_PATH .*/#define RTE_EAL_PMD_PATH ""/g' $(SPDK_ROOT_DIR)/dpdk/build-tmp/rte_build_config.h $(Q) \ - # TODO Meson build adds libbsd dependency when it's available. This means any app will be \ - # forced to link with -lbsd, but only if it's available on the system. The clean way to \ - # handle this would be to rely on DPDK's pkg-config file which will contain the -lbsd when \ - # required. For now just remove the libbsd dependency. DPDK will fallback to its internal \ - # functions. + # TODO Meson build adds libbsd and/or libarchive dependency when it's available. This means any app will be \ + # forced to link with -lbsd and/or -larchive, but only if it's available on the system. The clean way to \ + # handle this would be to rely on DPDK's pkg-config file which will contain the -lbsd/-larchive when \ + # required. For now just remove the dependencies. DPDK will fallback to its internal functions. $(Q)sed $(SED_INPLACE_FLAG) 's/#define RTE_USE_LIBBSD .*//g' $(SPDK_ROOT_DIR)/dpdk/build-tmp/rte_build_config.h + $(Q)sed $(SED_INPLACE_FLAG) 's/#define RTE_HAS_LIBARCHIVE .*//g' $(SPDK_ROOT_DIR)/dpdk/build-tmp/rte_build_config.h clean: $(Q)rm -rf $(SPDK_ROOT_DIR)/dpdk/build $(SPDK_ROOT_DIR)/dpdk/build-tmp