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 32DF6A04E6; Sat, 31 Oct 2020 08:00:35 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 72F6ECA18; Sat, 31 Oct 2020 08:00:33 +0100 (CET) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by dpdk.org (Postfix) with ESMTP id A3E54CA0A for ; Sat, 31 Oct 2020 08:00:31 +0100 (CET) Received: by mail-wr1-f66.google.com with SMTP id b3so2810095wrx.11 for ; Sat, 31 Oct 2020 00:00:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mayadata-io.20150623.gappssmtp.com; s=20150623; h=from:subject:cc:references:message-id:date:user-agent:mime-version :in-reply-to:content-transfer-encoding:content-language; bh=bLOCZP7FVN+Vg2mgYa1Hu6kYetww4y+YHMQQQvhGOmk=; b=hlKgAoT3s5AZpQVSmUdJgZUTLWQVNCeKQkla8A4PCsy9wLCl7+Wwl0yhmEybyTLlWr IdezGN5O8YfTPAK89SOycUjr4ECKOu1uVpkykEhSLRSvVVa/wzW7xNX+ixc4nTBCDDRm oQ917ejxAt/uN6rBFZCAvSvFMu34yVV3Mt6Kr1ZiW9ajHvDPCC1tw7LKBM0Kw+hC1KPn N9r+LWo1HyrX+VDf77PfJHTBHBDhnL5/EBwFjf/J34UdzsyhDZLWaLK7xGC7sVoEuRzr FwaxTiDNMUK+jOoP5Qrn8mj3rvfiZKcGldObtjA7j0NqXllZeQVdmlMdKuGiTzzpnHBK 8Vrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:subject:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding :content-language; bh=bLOCZP7FVN+Vg2mgYa1Hu6kYetww4y+YHMQQQvhGOmk=; b=pVtDbCc8XyvvWhNqrWspg48wCaR7lOkjcTt+3UMfBwjp3W8MTBNKHv40df5SLQ0Qbk jR7EPOrmF9funpnI06hV5vhRm1dpGpgH/iolUwauE1ADTBbsxA6cxFwu6B2TlyRj0M2p /Xkyp6Uv+FF5KDD5Lkq7aN6VDiS8KFzyA/9X+ZEfGX3tiID4lDXjJ8gRY0D+Bwh9gKbo Dk+rWg7eOzmnBf0L7ucut7AHdjwGwqv81KnuunTYnWmh9d1/bK4f6rgEXYzvfc3t7u9r Dhh5IloH7P6AQjgmNPyttuV95rH3DLb/RMfBqdbZ5P8rRgEEPpQf8clHH75ek/Eydgb8 PEUw== X-Gm-Message-State: AOAM531/3SXuIX3tU2YXEZq1EV8Pe7BpbNFGWD0duBnkOc8Xsx2pS4yS J1jKv4ZjJnKEVih7ylq2GWeE0Q== X-Google-Smtp-Source: ABdhPJzWI6WcEd4fotgCiKKCf86MxPWPPCM+BKLdGqi6zFHzZrObm7MAAOnwCSxFAhdamtArFYRH7Q== X-Received: by 2002:adf:9150:: with SMTP id j74mr8192565wrj.57.1604127630442; Sat, 31 Oct 2020 00:00:30 -0700 (PDT) Received: from [192.168.0.33] (cpc98320-croy25-2-0-cust77.19-2.cable.virginm.net. [80.235.134.78]) by smtp.gmail.com with ESMTPSA id b7sm12686921wrp.16.2020.10.31.00.00.29 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 31 Oct 2020 00:00:29 -0700 (PDT) From: Nick Connolly X-Google-Original-From: Nick Connolly Cc: dev@dpdk.org, bruce.richardson@intel.com, Ranjit Menon References: <20201031063949.829-1-nick.connolly@mayadata.io> <20201031064314.910-1-nick.connolly@mayadata.io> Message-ID: <8b67063a-a9b8-9316-6930-17ee447aa5e6@mayadata.io> Date: Sat, 31 Oct 2020 07:00:28 +0000 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.12.1 MIME-Version: 1.0 In-Reply-To: <20201031064314.910-1-nick.connolly@mayadata.io> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-GB Subject: Re: [dpdk-dev] [PATCH v2] 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" Missing / incorrect '--in-reply-to'. Please ignore - still learning the process! On 31/10/2020 06:43, Nick Connolly wrote: > 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. > > There were a number of changes to the way that import libraries > are handled between 0.47.1 and 0.54.0. Only make the change > for >= 0.54.0, leaving the behaviour unchanged for earlier > versions. > > Signed-off-by: Nick Connolly > Tested-by: Ranjit Menon > Acked-by: Ranjit Menon > --- > v2: > * split out config/meson.build change > > drivers/meson.build | 6 ++++-- > lib/meson.build | 6 ++++-- > 2 files changed, 8 insertions(+), 4 deletions(-) > > 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()]