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 9D269A04A3; Tue, 16 Jun 2020 11:17:44 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B77991BEC3; Tue, 16 Jun 2020 11:17:43 +0200 (CEST) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id C36CE1BE99 for ; Tue, 16 Jun 2020 11:17:41 +0200 (CEST) IronPort-SDR: scMKDww3DGk8ckKxLSE7GakQKylVK5rMaWcVwqRnSaZoiQzAX71TKjfXNPaG3Zqs60PqkOBUY0 4FVJYp3wtlwg== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Jun 2020 02:17:40 -0700 IronPort-SDR: v+L1++UGX4/0uKbE0reNdWfBUeLBWzjbMdGn/mpPv04h5RknJjPzmvkBoGe8imC/m2DXGjltKE g44XiibxGBtQ== X-IronPort-AV: E=Sophos;i="5.73,518,1583222400"; d="scan'208";a="449735462" Received: from bricha3-mobl.ger.corp.intel.com ([10.251.94.241]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-SHA; 16 Jun 2020 02:17:38 -0700 Date: Tue, 16 Jun 2020 10:17:34 +0100 From: Bruce Richardson To: talshn@mellanox.com Cc: dev@dpdk.org, thomas@monjalon.net, pallavi.kadam@intel.com, dmitry.kozliuk@gmail.com, david.marchand@redhat.com, grive@u256.net, ranjit.menon@intel.com, navasile@linux.microsoft.com, harini.ramakrishnan@microsoft.com, ocardona@microsoft.com, anatoly.burakov@intel.com Message-ID: <20200616091734.GA81@bricha3-MOBL.ger.corp.intel.com> References: <20200609103139.22168-1-talshn@mellanox.com> <20200609103139.22168-7-talshn@mellanox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200609103139.22168-7-talshn@mellanox.com> Subject: Re: [dpdk-dev] [PATCH v5 6/8] drivers: fix incorrect meson import folder for Windows 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 Tue, Jun 09, 2020 at 01:31:37PM +0300, talshn@mellanox.com wrote: > From: Tal Shnaiderman > > import library (/IMPLIB) in meson.build should use > the 'drivers' and not 'libs' folder. > > The error is: fatal error LNK1149: output filename matches input filename. > The fix uses the correct folder. > > Fixes: 5ed3766981 ("drivers: process shared link dependencies as for libs") > > Signed-off-by: Tal Shnaiderman > --- > drivers/meson.build | 10 +++++++--- > 1 file changed, 7 insertions(+), 3 deletions(-) > > diff --git a/drivers/meson.build b/drivers/meson.build > index a7eac86790..e216011d47 100644 > --- a/drivers/meson.build > +++ b/drivers/meson.build > @@ -153,7 +153,7 @@ foreach class:dpdk_driver_classes > version_map = '@0@/@1@/@2@_version.map'.format( > meson.current_source_dir(), > drv_path, lib_name) > - implib = dir_name + '.dll.a' > + implib = 'lib' + lib_name + '.dll.a' > > def_file = custom_target(lib_name + '_def', > command: [map_to_def_cmd, '@INPUT@', '@OUTPUT@'], > @@ -161,8 +161,12 @@ foreach class:dpdk_driver_classes > output: '@0@_exports.def'.format(lib_name)) > lk_deps = [version_map, def_file] > if is_windows > - lk_args = ['-Wl,/def:' + def_file.full_path(), > - '-Wl,/implib:lib\\' + implib] > + if is_ms_linker > + lk_args = ['-Wl,/def:' + def_file.full_path(), > + '-Wl,/implib:drivers\\' + implib] > + else > + lk_args = [] > + endif > else > lk_args = ['-Wl,--version-script=' + version_map] > # on unix systems check the output of the This looks ok to me, seems like the previous, broken, version was just a copy-paste (by me, I think!) from lib without updating to work with driver paths. Not an expert on the different linker parameters needed, but assume the submitter has those correct. Acked-by: Bruce Richardson