patch 'build: fix dependencies lookup' has been queued to stable release 20.11.8
luca.boccassi at gmail.com
luca.boccassi at gmail.com
Thu Feb 23 10:36:17 CET 2023
Hi,
FYI, your patch has been queued to stable release 20.11.8
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/25/23. So please
shout if anyone has objections.
Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.
Queued patches are on a temporary branch at:
https://github.com/bluca/dpdk-stable
This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/d079d8a2ea98b0c629af9f029dd35a053f0b7703
Thanks.
Luca Boccassi
---
>From d079d8a2ea98b0c629af9f029dd35a053f0b7703 Mon Sep 17 00:00:00 2001
From: Thomas Monjalon <thomas at monjalon.net>
Date: Sun, 15 Jan 2023 17:53:15 +0100
Subject: [PATCH] build: fix dependencies lookup
[ upstream commit 97cfdbfa28ae32d7667d76807233375ffd04adff ]
The first parameter of the Meson function "find_library()"
should be the library name without the "lib" prefix.
Otherwise Meson prints this warning:
WARNING: find_library('libexecinfo') starting in "lib"
only works by accident and is not portable
Fixes: 1cd512b2f532 ("build: detect execinfo library on Linux")
Fixes: e1defba4cf66 ("raw/ifpga/base: support device tree")
Fixes: a489f5dbf437 ("baseband/turbo_sw: support meson build")
Fixes: 72c00ae9dba7 ("regex/cn9k: use cnxk infrastructure")
Signed-off-by: Thomas Monjalon <thomas at monjalon.net>
Acked-by: Bruce Richardson <bruce.richardson at intel.com>
---
config/meson.build | 4 ++--
drivers/baseband/turbo_sw/meson.build | 26 +++++++++++++-------------
2 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/config/meson.build b/config/meson.build
index 2b7f647367..5058b733e3 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -152,7 +152,7 @@ if numa_dep.found() and cc.has_header('numaif.h')
endif
has_libfdt = 0
-fdt_dep = cc.find_library('libfdt', required: false)
+fdt_dep = cc.find_library('fdt', required: false)
if fdt_dep.found() and cc.has_header('fdt.h')
dpdk_conf.set10('RTE_HAS_LIBFDT', true)
has_libfdt = 1
@@ -160,7 +160,7 @@ if fdt_dep.found() and cc.has_header('fdt.h')
dpdk_extra_ldflags += '-lfdt'
endif
-libexecinfo = cc.find_library('libexecinfo', required: false)
+libexecinfo = cc.find_library('execinfo', required: false)
if libexecinfo.found() and cc.has_header('execinfo.h')
add_project_link_arguments('-lexecinfo', language: 'c')
dpdk_extra_ldflags += '-lexecinfo'
diff --git a/drivers/baseband/turbo_sw/meson.build b/drivers/baseband/turbo_sw/meson.build
index 55ef4e4ec7..34bbd550d2 100644
--- a/drivers/baseband/turbo_sw/meson.build
+++ b/drivers/baseband/turbo_sw/meson.build
@@ -6,15 +6,15 @@ path = get_option('flexran_sdk')
# check for FlexRAN SDK libraries for AVX2
lib4g = cc.find_library('libturbo', dirs: [path + '/lib_turbo'], required: false)
if lib4g.found()
- ext_deps += cc.find_library('libturbo', dirs: [path + '/lib_turbo'], required: true)
- ext_deps += cc.find_library('libcrc', dirs: [path + '/lib_crc'], required: true)
- ext_deps += cc.find_library('librate_matching', dirs: [path + '/lib_rate_matching'], required: true)
- ext_deps += cc.find_library('libcommon', dirs: [path + '/lib_common'], required: true)
- ext_deps += cc.find_library('libstdc++', required: true)
- ext_deps += cc.find_library('libirc', required: true)
- ext_deps += cc.find_library('libimf', required: true)
- ext_deps += cc.find_library('libipps', required: true)
- ext_deps += cc.find_library('libsvml', required: true)
+ ext_deps += cc.find_library('turbo', dirs: [path + '/lib_turbo'], required: true)
+ ext_deps += cc.find_library('crc', dirs: [path + '/lib_crc'], required: true)
+ ext_deps += cc.find_library('rate_matching', dirs: [path + '/lib_rate_matching'], required: true)
+ ext_deps += cc.find_library('common', dirs: [path + '/lib_common'], required: true)
+ ext_deps += cc.find_library('stdc++', required: true)
+ ext_deps += cc.find_library('irc', required: true)
+ ext_deps += cc.find_library('imf', required: true)
+ ext_deps += cc.find_library('ipps', required: true)
+ ext_deps += cc.find_library('svml', required: true)
includes += include_directories(path + '/lib_turbo')
includes += include_directories(path + '/lib_crc')
includes += include_directories(path + '/lib_rate_matching')
@@ -25,10 +25,10 @@ endif
# check for FlexRAN SDK libraries for AVX512
lib5g = cc.find_library('libldpc_decoder_5gnr', dirs: [path + '/lib_ldpc_decoder_5gnr'], required: false)
if lib5g.found()
- ext_deps += cc.find_library('libldpc_encoder_5gnr', dirs: [path + '/lib_ldpc_encoder_5gnr'], required: true)
- ext_deps += cc.find_library('libldpc_decoder_5gnr', dirs: [path + '/lib_ldpc_decoder_5gnr'], required: true)
- ext_deps += cc.find_library('libLDPC_ratematch_5gnr', dirs: [path + '/lib_LDPC_ratematch_5gnr'], required: true)
- ext_deps += cc.find_library('librate_dematching_5gnr', dirs: [path + '/lib_rate_dematching_5gnr'], required: true)
+ ext_deps += cc.find_library('ldpc_encoder_5gnr', dirs: [path + '/lib_ldpc_encoder_5gnr'], required: true)
+ ext_deps += cc.find_library('ldpc_decoder_5gnr', dirs: [path + '/lib_ldpc_decoder_5gnr'], required: true)
+ ext_deps += cc.find_library('LDPC_ratematch_5gnr', dirs: [path + '/lib_LDPC_ratematch_5gnr'], required: true)
+ ext_deps += cc.find_library('rate_dematching_5gnr', dirs: [path + '/lib_rate_dematching_5gnr'], required: true)
includes += include_directories(path + '/lib_ldpc_encoder_5gnr')
includes += include_directories(path + '/lib_ldpc_decoder_5gnr')
includes += include_directories(path + '/lib_LDPC_ratematch_5gnr')
--
2.39.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2023-02-23 09:36:28.816821048 +0000
+++ 0013-build-fix-dependencies-lookup.patch 2023-02-23 09:36:28.186169203 +0000
@@ -1 +1 @@
-From 97cfdbfa28ae32d7667d76807233375ffd04adff Mon Sep 17 00:00:00 2001
+From d079d8a2ea98b0c629af9f029dd35a053f0b7703 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 97cfdbfa28ae32d7667d76807233375ffd04adff ]
+
@@ -17 +18,0 @@
-Cc: stable at dpdk.org
@@ -23,3 +24,2 @@
- drivers/baseband/turbo_sw/meson.build | 10 +++++-----
- drivers/regex/cn9k/meson.build | 4 ++--
- 3 files changed, 9 insertions(+), 9 deletions(-)
+ drivers/baseband/turbo_sw/meson.build | 26 +++++++++++++-------------
+ 2 files changed, 15 insertions(+), 15 deletions(-)
@@ -28 +28 @@
-index b9ec685f28..26f3168bc9 100644
+index 2b7f647367..5058b733e3 100644
@@ -31 +31 @@
-@@ -191,7 +191,7 @@ if find_libnuma
+@@ -152,7 +152,7 @@ if numa_dep.found() and cc.has_header('numaif.h')
@@ -38,4 +38,4 @@
- dpdk_conf.set10('RTE_HAS_LIBFDT', true)
- has_libfdt = 1
-@@ -199,7 +199,7 @@ if fdt_dep.found() and cc.has_header('fdt.h')
- dpdk_extra_ldflags += '-lfdt'
+ dpdk_conf.set10('RTE_HAS_LIBFDT', true)
+ has_libfdt = 1
+@@ -160,7 +160,7 @@ if fdt_dep.found() and cc.has_header('fdt.h')
+ dpdk_extra_ldflags += '-lfdt'
@@ -46,3 +46,3 @@
- if libexecinfo.found()
- add_project_link_arguments('-lexecinfo', language: 'c')
- dpdk_extra_ldflags += '-lexecinfo'
+ if libexecinfo.found() and cc.has_header('execinfo.h')
+ add_project_link_arguments('-lexecinfo', language: 'c')
+ dpdk_extra_ldflags += '-lexecinfo'
@@ -50 +50 @@
-index 417ec63394..aeb9a76f9e 100644
+index 55ef4e4ec7..34bbd550d2 100644
@@ -53,34 +53,40 @@
-@@ -6,11 +6,11 @@ dep_turbo = dependency('flexran_sdk_turbo', required: false)
- dep_dec5g = dependency('flexran_sdk_ldpc_decoder_5gnr', required: false)
-
- if dep_turbo.found()
-- ext_deps += cc.find_library('libstdc++', required: true)
-- ext_deps += cc.find_library('libirc', required: true)
-- ext_deps += cc.find_library('libimf', required: true)
-- ext_deps += cc.find_library('libipps', required: true)
-- ext_deps += cc.find_library('libsvml', required: true)
-+ ext_deps += cc.find_library('stdc++', required: true)
-+ ext_deps += cc.find_library('irc', required: true)
-+ ext_deps += cc.find_library('imf', required: true)
-+ ext_deps += cc.find_library('ipps', required: true)
-+ ext_deps += cc.find_library('svml', required: true)
- ext_deps += dep_turbo
- ext_deps += dependency('flexran_sdk_crc', required: true)
- ext_deps += dependency('flexran_sdk_rate_matching', required: true)
-diff --git a/drivers/regex/cn9k/meson.build b/drivers/regex/cn9k/meson.build
-index 06c906710c..19b2e70111 100644
---- a/drivers/regex/cn9k/meson.build
-+++ b/drivers/regex/cn9k/meson.build
-@@ -8,10 +8,10 @@ if not is_linux or not dpdk_conf.get('RTE_ARCH_64')
- subdir_done()
- endif
-
--lib = cc.find_library('librxp_compiler', required: false)
-+lib = cc.find_library('rxp_compiler', required: false)
- if lib.found()
- ext_deps += lib
-- ext_deps += cc.find_library('libstdc++', required: true)
-+ ext_deps += cc.find_library('stdc++', required: true)
- cflags += ['-DREE_COMPILER_SDK']
- endif
-
+@@ -6,15 +6,15 @@ path = get_option('flexran_sdk')
+ # check for FlexRAN SDK libraries for AVX2
+ lib4g = cc.find_library('libturbo', dirs: [path + '/lib_turbo'], required: false)
+ if lib4g.found()
+- ext_deps += cc.find_library('libturbo', dirs: [path + '/lib_turbo'], required: true)
+- ext_deps += cc.find_library('libcrc', dirs: [path + '/lib_crc'], required: true)
+- ext_deps += cc.find_library('librate_matching', dirs: [path + '/lib_rate_matching'], required: true)
+- ext_deps += cc.find_library('libcommon', dirs: [path + '/lib_common'], required: true)
+- ext_deps += cc.find_library('libstdc++', required: true)
+- ext_deps += cc.find_library('libirc', required: true)
+- ext_deps += cc.find_library('libimf', required: true)
+- ext_deps += cc.find_library('libipps', required: true)
+- ext_deps += cc.find_library('libsvml', required: true)
++ ext_deps += cc.find_library('turbo', dirs: [path + '/lib_turbo'], required: true)
++ ext_deps += cc.find_library('crc', dirs: [path + '/lib_crc'], required: true)
++ ext_deps += cc.find_library('rate_matching', dirs: [path + '/lib_rate_matching'], required: true)
++ ext_deps += cc.find_library('common', dirs: [path + '/lib_common'], required: true)
++ ext_deps += cc.find_library('stdc++', required: true)
++ ext_deps += cc.find_library('irc', required: true)
++ ext_deps += cc.find_library('imf', required: true)
++ ext_deps += cc.find_library('ipps', required: true)
++ ext_deps += cc.find_library('svml', required: true)
+ includes += include_directories(path + '/lib_turbo')
+ includes += include_directories(path + '/lib_crc')
+ includes += include_directories(path + '/lib_rate_matching')
+@@ -25,10 +25,10 @@ endif
+ # check for FlexRAN SDK libraries for AVX512
+ lib5g = cc.find_library('libldpc_decoder_5gnr', dirs: [path + '/lib_ldpc_decoder_5gnr'], required: false)
+ if lib5g.found()
+- ext_deps += cc.find_library('libldpc_encoder_5gnr', dirs: [path + '/lib_ldpc_encoder_5gnr'], required: true)
+- ext_deps += cc.find_library('libldpc_decoder_5gnr', dirs: [path + '/lib_ldpc_decoder_5gnr'], required: true)
+- ext_deps += cc.find_library('libLDPC_ratematch_5gnr', dirs: [path + '/lib_LDPC_ratematch_5gnr'], required: true)
+- ext_deps += cc.find_library('librate_dematching_5gnr', dirs: [path + '/lib_rate_dematching_5gnr'], required: true)
++ ext_deps += cc.find_library('ldpc_encoder_5gnr', dirs: [path + '/lib_ldpc_encoder_5gnr'], required: true)
++ ext_deps += cc.find_library('ldpc_decoder_5gnr', dirs: [path + '/lib_ldpc_decoder_5gnr'], required: true)
++ ext_deps += cc.find_library('LDPC_ratematch_5gnr', dirs: [path + '/lib_LDPC_ratematch_5gnr'], required: true)
++ ext_deps += cc.find_library('rate_dematching_5gnr', dirs: [path + '/lib_rate_dematching_5gnr'], required: true)
+ includes += include_directories(path + '/lib_ldpc_encoder_5gnr')
+ includes += include_directories(path + '/lib_ldpc_decoder_5gnr')
+ includes += include_directories(path + '/lib_LDPC_ratematch_5gnr')
More information about the stable
mailing list