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 6EC55A04E6; Sat, 31 Oct 2020 07:45:11 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 5442DCA0A; Sat, 31 Oct 2020 07:45:10 +0100 (CET) Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by dpdk.org (Postfix) with ESMTP id 93767CA06 for ; Sat, 31 Oct 2020 07:45:08 +0100 (CET) Received: by mail-wr1-f44.google.com with SMTP id s9so8677094wro.8 for ; Fri, 30 Oct 2020 23:45:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mayadata-io.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mschp5JAeLM+mW+EGiXaxJwGzKPbw1AIkvTcka16F4I=; b=wvu+hP6Bh3/yq1t3ZhWxouy1s96jnqII5uiAig/Y6wuE0xizYKtsQpicFNjh7CQSdF fMnt6HOyNtl8KGtyn60U11xfqneNbeYsS6//nzwdyJV0zOwSqDPDszmNSOzEZMWHMy8Y n+086G2hCoPfGvK2a0+w9G4oMtWRi4f6r+lgrI+5XAI1sIePjgxC14iMmtfLpunMR8TM hpZwvdSvO5W2n2X3gPNBPyuCHzDr0x9TT54v27eHXQ/Tyn6YqIzn/EztEQW9frZGTaaD EAjbg5atHqBtd3VrrGlO+WsYmKfKtPcGbiU88DIP0pEX67rMtINGdns5giwgflvruS7C 5ogA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=mschp5JAeLM+mW+EGiXaxJwGzKPbw1AIkvTcka16F4I=; b=N1A8hi/jjTW9SRzpdZFHKyHiGH8ossuF3kbtl9z8A6f/89990m6ESUF82e/ulRww+z EXh+Y6f6sVxMUVbl633ijQE4t0vIos6Vfq4kirYZkOQHaSFmcF5JErjB4Rjig5Z3nyaR Yic+kgCnEoGwD+Cav7c5uXc3DemSmtm4ldaBq1hjQ30a9qgqgIXz7jmxV5gwWaN0Wf3g suhD6wHffLp2B2/v6GENim/0/r1sO0A3tZ1vGXp8GYVTIiWoo4xGMeF6a9cR+RA9qXcl RoZOXHd/g5NnlhlF7D9KmgIXJQlXt07xi4/+1tOl7vgpYz7wdAR/lleG482gaJK3J8mK ViWQ== X-Gm-Message-State: AOAM531JRQZIp0GswjgL4hwIfwi4KJjAZAyiAckG/pLS+geYf9xxLVGf RFVfNjYxuubhKpng49FCxorGnfJEZatgA78T X-Google-Smtp-Source: ABdhPJyTVZT/J+f6yY13H1KQM1gh6i0568RecYELeY1+g7ugaGpcJiQThWe1j9Fcmu0pBmjrmOCglQ== X-Received: by 2002:a5d:5261:: with SMTP id l1mr8194405wrc.105.1604126707015; Fri, 30 Oct 2020 23:45:07 -0700 (PDT) Received: from FENIX.localdomain (cpc98320-croy25-2-0-cust77.19-2.cable.virginm.net. [80.235.134.78]) by smtp.gmail.com with ESMTPSA id c185sm7620580wma.44.2020.10.30.23.45.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Oct 2020 23:45:06 -0700 (PDT) From: Nick Connolly To: Cc: dev@dpdk.org, bruce.richardson@intel.com, Nick Connolly , Ranjit Menon Date: Sat, 31 Oct 2020 06:44:55 +0000 Message-Id: <20201031064455.991-1-nick.connolly@mayadata.io> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201030174617.1958-1-nick.connolly@mayadata.io> References: <20201030174617.1958-1-nick.connolly@mayadata.io> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [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" 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()] -- 2.25.1