From: nucleo Date: Tue, 15 Aug 2023 17:59:35 +0000 (+0300) Subject: dpdk: Newer meson 0.55.3 X-Git-Tag: v24.02-rc0~69 X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F82%2F39382%2F4;p=vpp.git dpdk: Newer meson 0.55.3 Fixes error with python 3.12 No module named 'pkg_resources' 'import pkg_resources' removed in 0.55.3 Type: fix Change-Id: I15c8cf195fd07a0eb2f3b58f895ef4b26cc17b90 Signed-off-by: nucleo --- diff --git a/build/external/packages/dpdk.mk b/build/external/packages/dpdk.mk index 42ad74c3ec4..f15c9f79a37 100644 --- a/build/external/packages/dpdk.mk +++ b/build/external/packages/dpdk.mk @@ -182,8 +182,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.55 setuptools wheel pyelftools; fi) && \ - pip3 install --no-index --find-links=$(PIP_DOWNLOAD_DIR) meson==0.55 pyelftools && \ + (if ! ls $(PIP_DOWNLOAD_DIR)meson* ; then pip3 download -d $(PIP_DOWNLOAD_DIR) -f $(DL_CACHE_DIR) meson==0.55.3 setuptools wheel pyelftools; fi) && \ + pip3 install --no-index --find-links=$(PIP_DOWNLOAD_DIR) meson==0.55.3 pyelftools && \ PKG_CONFIG_PATH=$(dpdk_install_dir)/lib/pkgconfig meson setup $(dpdk_src_dir) \ $(dpdk_build_dir) \ $(DPDK_MESON_ARGS) \