aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Brown <nickbroon@gmail.com>2021-09-07 18:24:42 +0100
committerDamjan Marion <dmarion@me.com>2021-09-13 13:21:23 +0000
commitae4ed3265f50469b3373a952c39d683945f1d389 (patch)
treefc343e1a5df67b4f13f2cd1c82ef3ce37f5bc3be
parentea8adf76375389e4c46c1a2eb903743142e44a8d (diff)
build: verbose dpdk build requiring meson 0.55
allow verbose dpdk build to be enabled. Useful for tools, like debian blhc, that want to inspect build logs. The '--verbose' option to 'meson compile' requires at least version 0.55. Type: make Change-Id: I54e91298f632e2b91247680d9295701b05353abe Signed-off-by: Nick Brown <nickbroon@gmail.com>
-rw-r--r--build-data/packages/external.mk4
-rw-r--r--build/external/packages/dpdk.mk10
2 files changed, 11 insertions, 3 deletions
diff --git a/build-data/packages/external.mk b/build-data/packages/external.mk
index 4b3a7c0132c..e8f5939fe8c 100644
--- a/build-data/packages/external.mk
+++ b/build-data/packages/external.mk
@@ -53,6 +53,10 @@ ifneq ($(DPDK_MAKE_EXTRA_ARGS),)
DPDK_MAKE_ARGS += DPDK_MAKE_EXTRA_ARGS="$(DPDK_MAKE_EXTRA_ARGS)"
endif
+ifeq ("$(V)","1")
+DPDK_MAKE_ARGS += DPDK_VERBOSE=1
+endif
+
external_configure = echo
external_build = echo
diff --git a/build/external/packages/dpdk.mk b/build/external/packages/dpdk.mk
index 80979e0053a..2a2c27ba375 100644
--- a/build/external/packages/dpdk.mk
+++ b/build/external/packages/dpdk.mk
@@ -169,8 +169,8 @@ define dpdk_config_cmds
mkdir -p ../dpdk-meson-venv && \
python3 -m venv ../dpdk-meson-venv && \
source ../dpdk-meson-venv/bin/activate && \
- (if ! ls $(PIP_DOWNLOAD_DIR)meson* ; then pip3 download -d $(PIP_DOWNLOAD_DIR) -f $(DL_CACHE_DIR) meson==0.54 setuptools wheel pyelftools; fi) && \
- pip3 install --no-index --find-links=$(PIP_DOWNLOAD_DIR) meson==0.54 pyelftools && \
+ (if ! ls $(PIP_DOWNLOAD_DIR)meson* ; then pip3 download -d $(PIP_DOWNLOAD_DIR) -f $(DL_CACHE_DIR) meson==0.55 setuptools wheel pyelftools; fi) && \
+ pip3 install --no-index --find-links=$(PIP_DOWNLOAD_DIR) meson==0.55 pyelftools && \
PKG_CONFIG_PATH=$(dpdk_install_dir)/lib/pkgconfig meson setup $(dpdk_src_dir) \
$(dpdk_build_dir) \
$(DPDK_MESON_ARGS) \
@@ -182,10 +182,14 @@ define dpdk_config_cmds
$(call dpdk_config_def,USE_LIBBSD)
endef
+ifeq ("$(DPDK_VERBOSE)","1")
+DPDK_VERBOSE_BUILD = --verbose
+endif
+
define dpdk_build_cmds
cd $(dpdk_build_dir) && \
source ../dpdk-meson-venv/bin/activate && \
- meson compile -C . | tee $(dpdk_build_log) && \
+ meson compile $(DPDK_VERBOSE_BUILD) -C . | tee $(dpdk_build_log) && \
deactivate
endef