[v2,2/7] build: remove unnecessary variable
diff mbox series

Message ID 20200501135401.28124-3-bruce.richardson@intel.com
State Superseded
Delegated to: Thomas Monjalon
Headers show
Series
  • improve DPDK static builds with meson
Related show

Checks

Context Check Description
ci/Intel-compilation success Compilation OK
ci/checkpatch success coding style OK

Commit Message

Bruce Richardson May 1, 2020, 1:53 p.m. UTC
Since all libraries are explicitly linked as part of a build, we no longer
need to track ones that should be always included for linking against apps.

Previously telemetry was special-cased for linking as it was not directly
needed by the linker when linking the apps, since they never called into it
directly. This meant that it could be forgotten when specifying the app
dependencies, and so the telemetry support would not work. This
special-casing was never needed for make as it always linked in all
libraries, as meson does now.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
V2: added more detail on the history to the commit log
---
 app/meson.build                  | 2 +-
 lib/librte_telemetry/meson.build | 1 -
 meson.build                      | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

Patch
diff mbox series

diff --git a/app/meson.build b/app/meson.build
index 0f7fe9464..25f2da82e 100644
--- a/app/meson.build
+++ b/app/meson.build
@@ -36,7 +36,7 @@  foreach app:apps
 	# use "deps" for internal DPDK dependencies, and "ext_deps" for
 	# external package/library requirements
 	ext_deps = []
-	deps = dpdk_app_link_libraries
+	deps = []
 
 	subdir(name)
 
diff --git a/lib/librte_telemetry/meson.build b/lib/librte_telemetry/meson.build
index 1bdf128c1..c6e8cc5de 100644
--- a/lib/librte_telemetry/meson.build
+++ b/lib/librte_telemetry/meson.build
@@ -8,7 +8,6 @@  deps += ['metrics', 'ethdev']
 jansson = dependency('jansson', required: false)
 if jansson.found()
 	ext_deps += jansson
-	dpdk_app_link_libraries += ['telemetry']
 else
 	build = false
 	reason = 'missing dependency "jansson"'
diff --git a/meson.build b/meson.build
index d36580438..d8504afbf 100644
--- a/meson.build
+++ b/meson.build
@@ -19,7 +19,6 @@  dpdk_static_libraries = []
 dpdk_driver_classes = []
 dpdk_drivers = []
 dpdk_extra_ldflags = []
-dpdk_app_link_libraries = []
 dpdk_libs_disabled = []
 dpdk_drvs_disabled = []
 abi_version_file = files('ABI_VERSION')