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 81A1DA04DD for ; Tue, 17 Nov 2020 12:14:49 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 6B636593A; Tue, 17 Nov 2020 12:14:48 +0100 (CET) Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by dpdk.org (Postfix) with ESMTP id 469045916 for ; Tue, 17 Nov 2020 12:14:46 +0100 (CET) Received: by mail-wm1-f45.google.com with SMTP id c9so2838342wml.5 for ; Tue, 17 Nov 2020 03:14:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KnLBKREYlFEPjeqB58dMy7pDRgovnXN7RHlG9EbwsJU=; b=oiRPCHiO2I7tILqtT/X9GuUS9OzV35D36vHy0hkvnwDx23tR93QDzNmIZYwSty0F+J 8zI41obgh+hpgwqIL7hbkiUIu1xz14lTIRHfjkub93bDreW88eC+rGc6IsUlaM6NZkX4 RLyNx3wVj6VY4sPlCghUu6S7dLT7yjvWbtHMmJ4njZXv+2XND1q98ykFYm4gSpQgudUB Tb1KM+++iD9qPviaU1FBpzIRHu1K6RAqAZBksrw+fBvIJBCD6SlzAw9Ieh3IvBILqtgn d7TUOq7lsqy960XYu5OZPq5FVX7/uxQ7Hz6fOWnCLe1oymWNgTshjWZkJ6Le+eH80oLD /2Rg== 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=KnLBKREYlFEPjeqB58dMy7pDRgovnXN7RHlG9EbwsJU=; b=KObjYZKoppiv96/suh07LjKwPl4mWo4nvx7cnYSCTuB28dqD0k3wElfQDdaECuW8uF +JdblDW0yXiAmogQinZg4dCv4K+6cx4qPpF9rWLClj7jbphmF4nnPZ5mtXsNz78axt3a 6LIkuONaQh9C378tCuYqGIpOQo7/JYNAzVTDTp81A52DLQcQmojUQ5itotWjZFHfLXty rHjd/gGdip3BuEy4TwmU5IDPx3JNPniyxxLQgMBK9h15h1s5iD9ceQV1HvVNRyPrDrQi TzyBWc4K7uQfDRn+RrrAwzkFWW1gue+BGcITzmUx13dIx4F80Q7+dDzYNAXs85lh9N2f Lq4w== X-Gm-Message-State: AOAM532XardsRr2H0R2kX/LaWMPHzqPp+HvY4b217BlQ1S7PbL48t3Zo sihtt4l6s61xwrx8YemC5HQ= X-Google-Smtp-Source: ABdhPJxKfOfzwpUEou8sE7cIT0i/OEHUuQ7VgK6SXkmaHBpX+GRE4qL9GOkFoeZZSIPvtPmlfQGFNA== X-Received: by 2002:a1c:a752:: with SMTP id q79mr3713246wme.24.1605611685046; Tue, 17 Nov 2020 03:14:45 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id 89sm28093475wrp.58.2020.11.17.03.14.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Nov 2020 03:14:44 -0800 (PST) From: luca.boccassi@gmail.com To: Nick Connolly Cc: Ranjit Menon , Khoa To , dpdk stable Date: Tue, 17 Nov 2020 11:13:43 +0000 Message-Id: <20201117111416.1961049-9-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201117111416.1961049-1-luca.boccassi@gmail.com> References: <20201109185030.3478760-2-luca.boccassi@gmail.com> <20201117111416.1961049-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'build: fix MS linker flag with meson 0.54' has been queued to stable release 19.11.6 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/19/20. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/4162bc31e4b5de70a235a3f75cb3e11ff167f916 Thanks. Luca Boccassi --- >From 4162bc31e4b5de70a235a3f75cb3e11ff167f916 Mon Sep 17 00:00:00 2001 From: Nick Connolly Date: Sat, 31 Oct 2020 06:44:55 +0000 Subject: [PATCH] build: fix MS linker flag with meson 0.54 [ upstream commit 52a7cb0ad03a032ff33766cb1dc8553c17634ca6 ] 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. Fixes: 77cca7ccec13 ("build: fix drivers library path on Windows") Signed-off-by: Nick Connolly Tested-by: Ranjit Menon Acked-by: Ranjit Menon Acked-by: Khoa To --- 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 330b14636d..696079680b 100644 --- a/drivers/meson.build +++ b/drivers/meson.build @@ -160,8 +160,10 @@ foreach class:dpdk_driver_classes lk_deps = [version_map, def_file] 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 = [] endif diff --git a/lib/meson.build b/lib/meson.build index bf938a392a..b60396428c 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -150,8 +150,10 @@ foreach l:libraries output: 'rte_@0@_exports.def'.format(name)) 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 lk_args = ['-Wl,--version-script=' + version_map] endif -- 2.27.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-17 11:13:13.364489004 +0000 +++ 0009-build-fix-MS-linker-flag-with-meson-0.54.patch 2020-11-17 11:13:12.873115642 +0000 @@ -1 +1 @@ -From 52a7cb0ad03a032ff33766cb1dc8553c17634ca6 Mon Sep 17 00:00:00 2001 +From 4162bc31e4b5de70a235a3f75cb3e11ff167f916 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 52a7cb0ad03a032ff33766cb1dc8553c17634ca6 ] + @@ -17 +18,0 @@ -Cc: stable@dpdk.org @@ -29 +30 @@ -index 4bb7e92183..6b50f7238d 100644 +index 330b14636d..696079680b 100644 @@ -32,2 +33,2 @@ -@@ -186,8 +186,10 @@ foreach subpath:subdirs - lk_deps = [version_map, def_file, mingw_map] +@@ -160,8 +160,10 @@ foreach class:dpdk_driver_classes + lk_deps = [version_map, def_file] @@ -43 +44 @@ - lk_args = ['-Wl,--version-script=' + mingw_map.full_path()] + lk_args = [] @@ -46 +47 @@ -index 1bb019720c..ed00f89146 100644 +index bf938a392a..b60396428c 100644 @@ -49,2 +50,2 @@ -@@ -157,8 +157,10 @@ foreach l:libraries - output: '@0@_mingw.map'.format(libname)) +@@ -150,8 +150,10 @@ foreach l:libraries + output: 'rte_@0@_exports.def'.format(name)) @@ -60,2 +61,2 @@ - if is_windows - lk_args = ['-Wl,--version-script=' + mingw_map.full_path()] + lk_args = ['-Wl,--version-script=' + version_map] + endif