From: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
To: dev@dpdk.org
Cc: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>,
talshn@nvidia.com, stable@dpdk.org,
William Tu <u9012063@gmail.com>,
Bruce Richardson <bruce.richardson@intel.com>,
Narcisa Ana Maria Vasile <navasile@linux.microsoft.com>,
Dmitry Malloy <dmitrym@microsoft.com>,
Pallavi Kadam <pallavi.kadam@intel.com>,
Tal Shnaiderman <talshn@mellanox.com>
Subject: [dpdk-dev] [PATCH] build: propagate Windows system dependencies to pkg-config
Date: Fri, 20 Aug 2021 02:14:46 +0300 [thread overview]
Message-ID: <20210819231446.810897-1-dmitry.kozliuk@gmail.com> (raw)
Windows EAL depends on some system libraries. They were linked using
add_project_link_arguments('-l<LIB>'), which prevented meson from adding
them to Libs.private of pkg-config file. As a result, applications using
pkg-config to find DPDK hit link errors, for example:
librte_eal.a(eal_windows_eal_debug.c.obj) : error LNK2019: unresolved
external symbol __imp_SymInitialize referenced in function
rte_dump_stack
Reference required libraries in EAL using ext_deps meson variable.
bus/pci and net/pcap depend on lib/eal and will pull them automatically.
Drop advapi32 dependency, as MinGW locates VirtualAlloc2() dynamically.
Fixes: 2a5d547a4a9b ("eal/windows: implement basic memory management")
Fixes: c91717eb75c8 ("eal/windows: support exit and panic")
Cc: talshn@nvidia.com
Cc: stable@dpdk.org
Reported-by: William Tu <u9012063@gmail.com>
Signed-off-by: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
---
config/meson.build | 14 ++------------
lib/eal/windows/meson.build | 10 ++++++++++
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/config/meson.build b/config/meson.build
index e80421003b..3d5e1e33e7 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -339,7 +339,8 @@ if is_freebsd
endif
if is_windows
- # VirtualAlloc2() is available since Windows 10 / Server 2016.
+ # VirtualAlloc2() is available since Windows 10 / Server 2019.
+ # It's essential for EAL, so we don't support older versions.
add_project_arguments('-D_WIN32_WINNT=0x0A00', language: 'c')
# Use MinGW-w64 stdio, because DPDK assumes ANSI-compliant formatting.
@@ -351,17 +352,6 @@ if is_windows
if cc.get_id() == 'clang'
add_project_arguments('-D_CRT_SECURE_NO_WARNINGS', language: 'c')
endif
-
- add_project_link_arguments('-lws2_32', language: 'c')
-
- # Contrary to docs, VirtualAlloc2() is exported by mincore.lib
- # in Windows SDK, while MinGW exports it by advapi32.a.
- if is_ms_linker
- add_project_link_arguments('-lmincore', language: 'c')
- endif
-
- add_project_link_arguments('-ladvapi32', '-lsetupapi', language: 'c')
- add_project_link_arguments('-ldbghelp', language: 'c')
endif
if get_option('b_lto')
diff --git a/lib/eal/windows/meson.build b/lib/eal/windows/meson.build
index fc12fefd0d..845e406ca1 100644
--- a/lib/eal/windows/meson.build
+++ b/lib/eal/windows/meson.build
@@ -24,3 +24,13 @@ sources += files(
)
dpdk_conf.set10('RTE_EAL_NUMA_AWARE_HUGEPAGES', true)
+
+ext_deps += [
+ cc.find_library('dbghelp'),
+ cc.find_library('setupapi'),
+ cc.find_library('ws2_32'),
+]
+if is_ms_linker
+ # Contrary to docs, VirtualAlloc2() is exported by mincore.lib.
+ ext_deps += cc.find_library('mincore')
+endif
--
2.29.3
next reply other threads:[~2021-08-19 23:15 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-19 23:14 Dmitry Kozlyuk [this message]
2021-08-20 16:08 ` William Tu
2021-09-14 13:59 ` Thomas Monjalon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210819231446.810897-1-dmitry.kozliuk@gmail.com \
--to=dmitry.kozliuk@gmail.com \
--cc=bruce.richardson@intel.com \
--cc=dev@dpdk.org \
--cc=dmitrym@microsoft.com \
--cc=navasile@linux.microsoft.com \
--cc=pallavi.kadam@intel.com \
--cc=stable@dpdk.org \
--cc=talshn@mellanox.com \
--cc=talshn@nvidia.com \
--cc=u9012063@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).