Timer, LPM and Distributor libraries no longer use function versioning and therefore do not need separate build for static and shared version of libraries.
This patch removes use_function_versioning from their meson build files and corresponding include from the sources. Signed-off-by: Andrzej Ostruszka <aostrus...@marvell.com> Acked-by: Bruce Richardson <bruce.richard...@intel.com> Fixes: f2fb215843a9 ("timer: remove deprecated code") Fixes: 6e5b51676176 ("distributor: remove deprecated code") Fixes: c381a8d554b7 ("lpm: remove deprecated code") Cc: marcinx.ba...@intel.com --- V2: - removed also includes (updating only meson files causes build failures), and updated commit msg accordingly --- lib/librte_distributor/meson.build | 1 - lib/librte_distributor/rte_distributor.c | 1 - lib/librte_distributor/rte_distributor_single.c | 1 - lib/librte_lpm/meson.build | 1 - lib/librte_lpm/rte_lpm.c | 1 - lib/librte_lpm/rte_lpm6.c | 1 - lib/librte_timer/meson.build | 1 - lib/librte_timer/rte_timer.c | 1 - 8 files changed, 8 deletions(-) diff --git a/lib/librte_distributor/meson.build b/lib/librte_distributor/meson.build index 50b91887b..266af6434 100644 --- a/lib/librte_distributor/meson.build +++ b/lib/librte_distributor/meson.build @@ -9,7 +9,6 @@ else endif headers = files('rte_distributor.h') deps += ['mbuf'] -use_function_versioning = true # for clang 32-bit compiles we need libatomic for 64-bit atomic ops if cc.get_id() == 'clang' and dpdk_conf.get('RTE_ARCH_64') == false diff --git a/lib/librte_distributor/rte_distributor.c b/lib/librte_distributor/rte_distributor.c index 6c5b0c86e..1c047f065 100644 --- a/lib/librte_distributor/rte_distributor.c +++ b/lib/librte_distributor/rte_distributor.c @@ -8,7 +8,6 @@ #include <rte_mbuf.h> #include <rte_memory.h> #include <rte_cycles.h> -#include <rte_function_versioning.h> #include <rte_memzone.h> #include <rte_errno.h> #include <rte_string_fns.h> diff --git a/lib/librte_distributor/rte_distributor_single.c b/lib/librte_distributor/rte_distributor_single.c index 91d8824c6..abaf7730c 100644 --- a/lib/librte_distributor/rte_distributor_single.c +++ b/lib/librte_distributor/rte_distributor_single.c @@ -9,7 +9,6 @@ #include <rte_memory.h> #include <rte_memzone.h> #include <rte_errno.h> -#include <rte_function_versioning.h> #include <rte_string_fns.h> #include <rte_eal_memconfig.h> #include <rte_pause.h> diff --git a/lib/librte_lpm/meson.build b/lib/librte_lpm/meson.build index 27ce45b53..021ac6d8d 100644 --- a/lib/librte_lpm/meson.build +++ b/lib/librte_lpm/meson.build @@ -7,4 +7,3 @@ headers = files('rte_lpm.h', 'rte_lpm6.h') # without worrying about which architecture we actually need headers += files('rte_lpm_altivec.h', 'rte_lpm_neon.h', 'rte_lpm_sse.h') deps += ['hash'] -use_function_versioning = true diff --git a/lib/librte_lpm/rte_lpm.c b/lib/librte_lpm/rte_lpm.c index b78c48744..268756419 100644 --- a/lib/librte_lpm/rte_lpm.c +++ b/lib/librte_lpm/rte_lpm.c @@ -22,7 +22,6 @@ #include <rte_rwlock.h> #include <rte_spinlock.h> #include <rte_tailq.h> -#include <rte_function_versioning.h> #include "rte_lpm.h" diff --git a/lib/librte_lpm/rte_lpm6.c b/lib/librte_lpm/rte_lpm6.c index c46e557e2..b981e4071 100644 --- a/lib/librte_lpm/rte_lpm6.c +++ b/lib/librte_lpm/rte_lpm6.c @@ -25,7 +25,6 @@ #include <assert.h> #include <rte_jhash.h> #include <rte_tailq.h> -#include <rte_function_versioning.h> #include "rte_lpm6.h" diff --git a/lib/librte_timer/meson.build b/lib/librte_timer/meson.build index b7edfe2e7..d3b828ce9 100644 --- a/lib/librte_timer/meson.build +++ b/lib/librte_timer/meson.build @@ -4,4 +4,3 @@ sources = files('rte_timer.c') headers = files('rte_timer.h') allow_experimental_apis = true -use_function_versioning = true diff --git a/lib/librte_timer/rte_timer.c b/lib/librte_timer/rte_timer.c index a1ed186cf..89f27074f 100644 --- a/lib/librte_timer/rte_timer.c +++ b/lib/librte_timer/rte_timer.c @@ -26,7 +26,6 @@ #include <rte_memzone.h> #include <rte_malloc.h> #include <rte_errno.h> -#include <rte_function_versioning.h> #include "rte_timer.h" -- 2.17.1