[dpdk-dev] [PATCH 1/2] eal: fix shared lib mode detection
Timothy Redaelli
tredaelli at redhat.com
Tue Nov 24 16:14:14 CET 2020
Commit 06c7871dde01 ("eal: restrict default plugin path to shared lib mode")
introduced a check that enabled shared lib mode when librte_eal.so can
be loaded, but it can't work, at least, on Fedora/CentOS/RHEL since .so
symlinks are not installed when you install dpdk package, but only when
you install dpdk-devel package.
This commit uses librte_eal.so.ABI_VERSION to check for shared lib,
since it exists on any linux distributions.
See Fedora Packaging Guidelines for more informations:
https://docs.fedoraproject.org/en-US/packaging-guidelines/#_devel_packages
Fixes: 06c7871dde01 ("eal: restrict default plugin path to shared lib mode")
Cc: bruce.richardson at intel.com
Cc: stable at dpdk.org
Signed-off-by: Timothy Redaelli <tredaelli at redhat.com>
---
lib/librte_eal/common/eal_common_options.c | 3 ++-
lib/librte_eal/common/meson.build | 2 ++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/lib/librte_eal/common/eal_common_options.c b/lib/librte_eal/common/eal_common_options.c
index fc6f0cea93..e6f77ad217 100644
--- a/lib/librte_eal/common/eal_common_options.c
+++ b/lib/librte_eal/common/eal_common_options.c
@@ -503,7 +503,8 @@ eal_plugins_init(void)
* (Using dlopen with NOLOAD flag on EAL, will return NULL if the EAL
* shared library is not already loaded i.e. it's statically linked.)
*/
- if (dlopen("librte_eal.so", RTLD_LAZY | RTLD_NOLOAD) != NULL &&
+ if (dlopen("librte_eal.so."ABI_VERSION, RTLD_LAZY | RTLD_NOLOAD)
+ != NULL &&
*default_solib_dir != '\0' &&
stat(default_solib_dir, &sb) == 0 &&
S_ISDIR(sb.st_mode))
diff --git a/lib/librte_eal/common/meson.build b/lib/librte_eal/common/meson.build
index 9f32262450..39abf7a0a4 100644
--- a/lib/librte_eal/common/meson.build
+++ b/lib/librte_eal/common/meson.build
@@ -3,6 +3,8 @@
includes += include_directories('.')
+cflags += [ '-DABI_VERSION="@0@"'.format(abi_version) ]
+
if is_windows
sources += files(
'eal_common_bus.c',
--
2.28.0
More information about the dev
mailing list