From: John Alexander <John.Alexander@datapath.co.uk>
To: Nick Connolly <nick.connolly@mayadata.io>,
Bruce Richardson <bruce.richardson@intel.com>
Cc: "dev@dpdk.org" <dev@dpdk.org>
Subject: Re: [dpdk-dev] [PATCH] windows: minor build fixes
Date: Fri, 30 Oct 2020 19:57:25 +0000 [thread overview]
Message-ID: <DB6PR0902MB2072A91AECFF70D00F15E336B4150@DB6PR0902MB2072.eurprd09.prod.outlook.com> (raw)
In-Reply-To: <20201030174617.1958-2-nick.connolly@mayadata.io>
> -----Original Message-----
> From: dev <dev-bounces@dpdk.org> On Behalf Of Nick Connolly
> Sent: 30 October 2020 17:46
> To: Bruce Richardson <bruce.richardson@intel.com>
> Cc: dev@dpdk.org; Nick Connolly <nick.connolly@mayadata.io>
> Subject: [dpdk-dev] [PATCH] windows: minor build fixes
>
> CAUTION: This email originated from outside of the organization. Do not click
> links or open attachments unless you recognize the sender and know the
> content is safe.
>
> Don't run symlink-drivers-solibs.sh as part of 'install' because Windows
> doesn't support shell scripts.
>
> Meson versions >= 0.54.0 include support for handling /implib with msvc
> link. Specifying it explicitly causes failures when linking against the dll. Tested
> using Link 14.27.29112.0 and Clang 11.0.0.
>
> Signed-off-by: Nick Connolly <nick.connolly@mayadata.io>
> ---
> config/meson.build | 8 +++++---
> drivers/meson.build | 6 ++++--
> lib/meson.build | 6 ++++--
> 3 files changed, 13 insertions(+), 7 deletions(-)
>
> diff --git a/config/meson.build b/config/meson.build index
> 258b01d06..a29693b88 100644
> --- a/config/meson.build
> +++ b/config/meson.build
> @@ -57,9 +57,11 @@ eal_pmd_path = join_paths(get_option('prefix'),
> driver_install_path) # driver .so files often depend upon the bus drivers for
> their connect bus, # e.g. ixgbe depends on librte_bus_pci. This means that
> the bus drivers need # to be in the library path, so symlink the drivers from
> the main lib directory.
> -meson.add_install_script('../buildtools/symlink-drivers-solibs.sh',
> - get_option('libdir'),
> - pmd_subdir_opt)
> +if not is_windows
> + meson.add_install_script('../buildtools/symlink-drivers-solibs.sh',
> + get_option('libdir'),
> + pmd_subdir_opt)
> +endif
>
> # set the machine type and cflags for it if meson.is_cross_build() diff --git
> a/drivers/meson.build b/drivers/meson.build index 4bb7e9218..6b50f7238
> 100644
> --- a/drivers/meson.build
> +++ b/drivers/meson.build
> @@ -186,8 +186,10 @@ foreach subpath:subdirs
> lk_deps = [version_map, def_file, mingw_map]
> if is_windows
> if is_ms_linker
> - lk_args = ['-Wl,/def:' + def_file.full_path(),
> - '-Wl,/implib:drivers\\' + implib]
> + lk_args = ['-Wl,/def:' + def_file.full_path()]
> + if meson.version().version_compare('<0.54.0')
> + lk_args += ['-Wl,/implib:drivers\\' + implib]
> + endif
> else
> lk_args = ['-Wl,--version-script=' +
> mingw_map.full_path()]
> endif
> diff --git a/lib/meson.build b/lib/meson.build index 1bb019720..ed00f8914
> 100644
> --- a/lib/meson.build
> +++ b/lib/meson.build
> @@ -157,8 +157,10 @@ foreach l:libraries
> output: '@0@_mingw.map'.format(libname))
>
> if is_ms_linker
> - lk_args = ['-Wl,/def:' + def_file.full_path(),
> - '-Wl,/implib:lib\\' + implib]
> + lk_args = ['-Wl,/def:' + def_file.full_path()]
> + if meson.version().version_compare('<0.54.0')
> + lk_args += ['-Wl,/implib:lib\\' + implib]
> + endif
> else
> if is_windows
> lk_args = ['-Wl,--version-script=' +
> mingw_map.full_path()]
> --
> 2.25.1
Hi,
Do we know what the motivation to rename the import library for the Windows build was in the first place? I've tried removing the renaming of the import library completely in the Windows build and the build produces valid output (a valid DLL and paired import library is generated for each RTE lib using clang build); The meson version test addition may be unnecessary here?
Kind Regards,
John Alexander.
next prev parent reply other threads:[~2020-10-30 19:57 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-30 17:46 [dpdk-dev] [PATCH] Windows: " Nick Connolly
2020-10-30 17:46 ` [dpdk-dev] [PATCH] windows: " Nick Connolly
2020-10-30 19:57 ` John Alexander [this message]
2020-10-30 20:21 ` Nick Connolly
2020-10-30 21:41 ` Ranjit Menon
2020-10-30 22:51 ` Tal Shnaiderman
2020-10-31 6:16 ` Nick Connolly
2020-10-31 6:44 ` [dpdk-dev] [PATCH v2] " Nick Connolly
2020-11-06 18:51 ` [dpdk-dev] [EXTERNAL] " Khoa To
2020-11-13 14:16 ` 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=DB6PR0902MB2072A91AECFF70D00F15E336B4150@DB6PR0902MB2072.eurprd09.prod.outlook.com \
--to=john.alexander@datapath.co.uk \
--cc=bruce.richardson@intel.com \
--cc=dev@dpdk.org \
--cc=nick.connolly@mayadata.io \
/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).