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 0DACFA0518 for ; Fri, 24 Jul 2020 14:04:39 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 060F81C067; Fri, 24 Jul 2020 14:04:39 +0200 (CEST) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by dpdk.org (Postfix) with ESMTP id 5BFDD1C067 for ; Fri, 24 Jul 2020 14:04:37 +0200 (CEST) Received: by mail-wr1-f66.google.com with SMTP id z18so4515915wrm.12 for ; Fri, 24 Jul 2020 05:04:37 -0700 (PDT) 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=xey/ynYDsF0ETW76D6SWUd5p4/2e5WhS42Zrwvfz59w=; b=f6aD/eI8IlgztzhoTsdTlRGjDGXiUYaqwdfWqk0UaqD9Hg+ZWcLSY4TXxcHF1JWXvx 7pcdiG/Gz1IICe5RmERv0T6ffefli7eB3eAGoCIeZHIles8mwvzYJkqrJYBsRNOG4kn5 ATrdT1JDJztkjFJGwBiA4KymeBapP9C9j99BCTg4I9iCC5v5dhW16wvBndFYZxioZfLP ZLPxea2VgevwQtxsenI63Q4g/dTGcWPmIYTy9009zLfeR56s9oGpYeS+ZR0u1K1p7Bj/ Y/JR3LQxBXcx5p9G9HMpxP5/uajXBBMD7w6btIcBiVqMO6o82kCMrzEmHL6h9p8GfqkG lbBA== 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=xey/ynYDsF0ETW76D6SWUd5p4/2e5WhS42Zrwvfz59w=; b=oy02SWbO/wFxgsht+AkmJaniDH7cGxKMliXpxZg/3WTe75jMeQKoxcj6bswxLuFhyd DWoVF8mleIfZtOwSdpWsdNnzfGrH26QJ03dMBf2hqXrvhzV9mw78wvTdo7+GoHarKgMS v9ABqs33RNh6xdlhSw41knqXXbtzv+yzNXYWzTC0R/+k1ml+99QSDpxo9+UiNq2QJrE9 o2xtdCAL0uNCqwQD7Ohc8TGsNregpDfJWhFyq8xH+MLyb1DiUBuvfTlbszLWlwEMy186 vJ+6FWSjnLd7jFBzfv/wF2eVvX/2n1f5QFkyeI5hU6rh3oB+bayN0xQ9HPDY6je29XOZ 2EXg== X-Gm-Message-State: AOAM532Ie/UWiB2C9nV8TqZk1rSo/PocCNBDMCVwpYGJ9ScALEyYCKRk T66M075gwYo88fGke7/lVNM= X-Google-Smtp-Source: ABdhPJzmk/vXbgz4sPY2yKmoTm2m1VbxmkgkZh0AHMkEvihQr8JeqkMVb1mRZSqD9O5+LseleCIJpQ== X-Received: by 2002:a5d:5681:: with SMTP id f1mr7945084wrv.192.1595592277054; Fri, 24 Jul 2020 05:04:37 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id j8sm1099295wrd.85.2020.07.24.05.04.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2020 05:04:33 -0700 (PDT) From: luca.boccassi@gmail.com To: Tal Shnaiderman Cc: dpdk stable Date: Fri, 24 Jul 2020 12:58:15 +0100 Message-Id: <20200724120030.1863487-57-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200724120030.1863487-1-luca.boccassi@gmail.com> References: <20200724120030.1863487-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'build: fix drivers library path on Windows' has been queued to stable release 19.11.4 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.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/26/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. Thanks. Luca Boccassi --- >From 621b21301cc0fcf240a6fc0622f58ec8ff798136 Mon Sep 17 00:00:00 2001 From: Tal Shnaiderman Date: Mon, 29 Jun 2020 15:37:38 +0300 Subject: [PATCH] build: fix drivers library path on Windows [ upstream commit 77cca7ccec13b617c64f21c573c9e6ac5b4aed64 ] 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 32d68aa1d..4246cc32a 100644 --- a/drivers/meson.build +++ b/drivers/meson.build @@ -151,7 +151,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@'], @@ -159,8 +159,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 -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-07-24 12:53:50.802101153 +0100 +++ 0057-build-fix-drivers-library-path-on-Windows.patch 2020-07-24 12:53:48.275006236 +0100 @@ -1,8 +1,10 @@ -From 77cca7ccec13b617c64f21c573c9e6ac5b4aed64 Mon Sep 17 00:00:00 2001 +From 621b21301cc0fcf240a6fc0622f58ec8ff798136 Mon Sep 17 00:00:00 2001 From: Tal Shnaiderman Date: Mon, 29 Jun 2020 15:37:38 +0300 Subject: [PATCH] build: fix drivers library path on Windows +[ upstream commit 77cca7ccec13b617c64f21c573c9e6ac5b4aed64 ] + import library (/IMPLIB) in meson.build should use the 'drivers' and not 'libs' folder. @@ -10,7 +12,6 @@ The fix uses the correct folder. Fixes: 5ed3766981 ("drivers: process shared link dependencies as for libs") -Cc: stable@dpdk.org Signed-off-by: Tal Shnaiderman --- @@ -18,10 +19,10 @@ 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/meson.build b/drivers/meson.build -index 6ce2d6b50..ccdc73868 100644 +index 32d68aa1d..4246cc32a 100644 --- a/drivers/meson.build +++ b/drivers/meson.build -@@ -153,7 +153,7 @@ foreach class:dpdk_driver_classes +@@ -151,7 +151,7 @@ foreach class:dpdk_driver_classes version_map = '@0@/@1@/@2@_version.map'.format( meson.current_source_dir(), drv_path, lib_name) @@ -30,7 +31,7 @@ def_file = custom_target(lib_name + '_def', command: [map_to_def_cmd, '@INPUT@', '@OUTPUT@'], -@@ -161,8 +161,12 @@ foreach class:dpdk_driver_classes +@@ -159,8 +159,12 @@ foreach class:dpdk_driver_classes output: '@0@_exports.def'.format(lib_name)) lk_deps = [version_map, def_file] if is_windows