From d27494647a325a6d2a512724caca7b294b775be8 Mon Sep 17 00:00:00 2001 From: Sunil Pai G Date: Thu, 28 Jan 2021 10:32:24 +0000 Subject: acinclude: Remove default library for DPDK. The default DPDK library used before this patch in case pkg-config fails to find libdpdk is only valid for make based DPDK builds. Hence remove them. As a consequence, now this error message [1] is thrown when pkg-config cannot find libdpdk instead of proceeding to check for a faulty pkg-config and reporting incorrect error message [2]. Also, update the documentation to export PKG_CONFIG_PATH since on some systems, the default install path for DPDK libraries is not present in the default search path of pkg-config. Ex: for Fedora 32 default pkg-config search path: /usr/lib64/pkgconfig:/usr/share/pkgconfig while by default Meson installs DPDK libraries at: /usr/local/lib64/pkgconfig [1] Package libdpdk was not found in the pkg-config search path. Perhaps you should add the directory containing `libdpdk.pc' to the PKG_CONFIG_PATH environment variable Package 'libdpdk', required by 'virtual:world', not found [2] checking for DPDK... no checking for faulty pkg-config version... yes configure: error: Please upgrade pkg-config Also, update the build documentation for AVX512 optimization. Fixes: 252e1e576443 ("dpdk: Update to use DPDK v20.11.") Reported-by: Kevin Traynor Acked-by: Kevin Traynor Signed-off-by: Sunil Pai G Signed-off-by: Ilya Maximets --- acinclude.m4 | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'acinclude.m4') diff --git a/acinclude.m4 b/acinclude.m4 index a67e397b6..435685c93 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -350,16 +350,12 @@ AC_DEFUN([OVS_CHECK_DPDK], [ "shared") PKG_CHECK_MODULES([DPDK], [libdpdk], [ DPDK_INCLUDE="$DPDK_CFLAGS" - DPDK_LIB="$DPDK_LIBS"], [ - DPDK_INCLUDE="-I/usr/local/include/dpdk -I/usr/include/dpdk" - DPDK_LIB="-ldpdk"]) + DPDK_LIB="$DPDK_LIBS"]) ;; "static" | "yes") PKG_CHECK_MODULES_STATIC([DPDK], [libdpdk], [ DPDK_INCLUDE="$DPDK_CFLAGS" - DPDK_LIB="$DPDK_LIBS"], [ - DPDK_INCLUDE="-I/usr/local/include/dpdk -I/usr/include/dpdk" - DPDK_LIB="-ldpdk"]) + DPDK_LIB="$DPDK_LIBS"]) dnl Statically linked private DPDK objects of form dnl -l:file.a must be positioned between -- cgit v1.2.1