From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 29A20A04E6; Fri, 30 Oct 2020 22:41:22 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id F25CDBBA4; Fri, 30 Oct 2020 22:41:18 +0100 (CET) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id 99CB7ACAA for ; Fri, 30 Oct 2020 22:41:17 +0100 (CET) IronPort-SDR: q4Lw1sxoCEse2f2SFyuf9ztRfkqHzWw7w1XPgplWfc63EQga7uCfLTZeDdeF33WX4GgsCJhkeB EYQ0ERx2uGOA== X-IronPort-AV: E=McAfee;i="6000,8403,9790"; a="168766123" X-IronPort-AV: E=Sophos;i="5.77,434,1596524400"; d="scan'208,217";a="168766123" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Oct 2020 14:41:14 -0700 IronPort-SDR: 7VyfUyfJROTQAHUokWSb8O9CH7SZUW0b79i93S2IXSCABCLNTZzhx3ZQ/r8rS6GPTiI35i/RqO VSkYRPDTskJg== X-IronPort-AV: E=Sophos;i="5.77,434,1596524400"; d="scan'208,217";a="361972232" Received: from rmenon-desk.amr.corp.intel.com (HELO [10.166.30.253]) ([10.166.30.253]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Oct 2020 14:41:14 -0700 To: Nick Connolly , Bruce Richardson Cc: dev@dpdk.org References: <20201030174617.1958-1-nick.connolly@mayadata.io> <20201030174617.1958-2-nick.connolly@mayadata.io> From: Ranjit Menon Message-ID: <26a9b54f-9974-6dc7-85dc-63c72e3da84c@intel.com> Date: Fri, 30 Oct 2020 14:41:12 -0700 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:68.0) Gecko/20100101 Thunderbird/68.12.1 MIME-Version: 1.0 In-Reply-To: <20201030174617.1958-2-nick.connolly@mayadata.io> Content-Language: en-US Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-Content-Filtered-By: Mailman/MimeDel 2.1.15 Subject: Re: [dpdk-dev] [PATCH] windows: minor build fixes X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" On 10/30/2020 10:46 AM, Nick Connolly wrote: > 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 > --- > 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()] Thanks, Nick. This finally fixes this problem I've been having since I upgraded to meson v0.54. Tested-by: Ranjit Menon Acked-by: Ranjit Menon