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 488B1A04E6; Sat, 31 Oct 2020 07:43:30 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id ABA99CA0A; Sat, 31 Oct 2020 07:43:28 +0100 (CET) Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by dpdk.org (Postfix) with ESMTP id 855AFCA06 for ; Sat, 31 Oct 2020 07:43:26 +0100 (CET) Received: by mail-wr1-f43.google.com with SMTP id m13so8692883wrj.7 for ; Fri, 30 Oct 2020 23:43:26 -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=clgBVc3rwDroIrFBEL7qoQ13OA11Pl1rN2yJp1U/SRdgPcVYFFQcQ33ptFO8eRuxJD KxFiuODASS3bgZwPKZaiPeirFnJWy0a1YdBbwoXF/jNk+uoZr2JpTA7LpzZAkPyUsPIC VALaiCQMap0uAjfQ4z7rmU/oujWjM5G3ejIa0vl/eqEQWLqtpEFNZ8/nvoFfn5C+7iq6 owOquOPvj5pvPUZ84iBaX+ikKkpCWY3wicNih+lNOyfG9KdAeyChQYwucmTxHb+qOOsc pvTN8rXqdbWBbN8pSYkUU5BTnn/41vqKIEjpq53mW4ul9CXObX3sm1o7B2LXjl/lN47H 84Gw== 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=LD7wV4SEuuIDiqthONZq2wJlYKt5gpU1qRScT+BYY1ngYLgdBOvN3vfjhjM+6KpgLz 9e4JUPKIiaI4qmfnZNqNMz4jf0eSHM3rOdsBaj2WR/miueQwhaxRYboeEQCOy2D1QEhj 85ookf6FtuDvzpsiNOzJVj8O/D0KZRmCyWTRJhLLDVqN9ZDAv+OQx55X8W0aaMtBnMTw PxbBw0/fMHaZch5wZGnzlv/R1U/Mo5s9KbTB1nQKSOeDI8Q67xjcfvFhl8Xhv1fEskXt 4RzQgAQPlyrtZDvWbpJ8G5Rv/SVnDaJAHMfXpZTOl67DXYrGUmxpHge5Pfuap6cftXjn hz5Q== X-Gm-Message-State: AOAM532f8YdtTd8z0ymzwG/It92vSVVvp/9PSBhWHkc2OGSppWtAJhID Bdr/Q4gh83ec0N7sHcD7B5vm5dVi0FHtsu1J X-Google-Smtp-Source: ABdhPJxL41laPrkOv16ZGkklCEbtrxZS1/r6RAn8PBqBx7LaOdUYnzSg2Qya8jPJFq7OvcK+sA7mfg== X-Received: by 2002:adf:f1c8:: with SMTP id z8mr8172404wro.371.1604126605826; Fri, 30 Oct 2020 23:43:25 -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 f5sm7153750wmh.16.2020.10.30.23.43.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Oct 2020 23:43:25 -0700 (PDT) From: Nick Connolly To: Cc: dev@dpdk.org, bruce.richardson@intel.com, Nick Connolly , Ranjit Menon Date: Sat, 31 Oct 2020 06:43:14 +0000 Message-Id: <20201031064314.910-1-nick.connolly@mayadata.io> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201031063949.829-1-nick.connolly@mayadata.io> References: <20201031063949.829-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