[dpdk-stable] [PATCH 7/7] Regenerate meson.build changes required due to reverts

[Christian Ehrhardt]

Due to a series of re-re-reverts by this case:
http://mails.dpdk.org/archives/stable/2021-March/029418.html
http://mails.dpdk.org/archives/stable/2020-September/024796.html
The two changes of:
  3f33f5056 build: fix plugin load on static build
  4a2baf099 build: fix linker flags on Windows
would have been lost.
Re-apply them here to have the reverts only remove what was added by them.

Fixes: 16ade738fd0d ("app/testpmd: build with meson")
Fixes: 89f0711f9ddf ("examples: build some samples with meson")
Fixes: b031e13d7f0d ("build: fix plugin load on static build")

Signed-off-by: Christian Ehrhardt <christian.ehrhardt at canonical.com>
---
 meson.build | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index 58995252bd..01bbb556ec 100644
--- a/meson.build
+++ b/meson.build
@@ -64,9 +64,14 @@ configure_file(output: build_cfg,
 		install_dir: join_paths(get_option('includedir'),
 				get_option('include_subdir_arch')))
 
+platform_flags = []
+if not is_windows
+       platform_flags += ['-Wl,--export-dynamic'] # ELF only
+endif
+
 # for static builds, include the drivers as libs and we need to "whole-archive"
 # them.
-dpdk_drivers = ['-Wl,--whole-archive'] + dpdk_drivers + ['-Wl,--no-whole-archive']
+dpdk_drivers = ['-Wl,--whole-archive'] + dpdk_drivers + ['-Wl,--no-whole-archive'] + platform_flags
 
 pkg = import('pkgconfig')
 pkg_extra_cflags = ['-include', 'rte_config.h'] + machine_args
-- 
2.30.0