From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id D7E2BA0548;
Tue, 17 Aug 2021 16:35:43 +0200 (CEST)
Received: from [217.70.189.124] (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 4F8BB407FF;
Tue, 17 Aug 2021 16:35:43 +0200 (CEST)
Received: from mga14.intel.com (mga14.intel.com [192.55.52.115])
by mails.dpdk.org (Postfix) with ESMTP id A04644014E;
Tue, 17 Aug 2021 16:35:41 +0200 (CEST)
X-IronPort-AV: E=McAfee;i="6200,9189,10079"; a="215836807"
X-IronPort-AV: E=Sophos;i="5.84,329,1620716400"; d="scan'208";a="215836807"
Received: from fmsmga008.fm.intel.com ([10.253.24.58])
by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;
17 Aug 2021 07:35:40 -0700
X-IronPort-AV: E=Sophos;i="5.84,329,1620716400"; d="scan'208";a="488045577"
Received: from bricha3-mobl.ger.corp.intel.com ([10.252.21.74])
by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-SHA;
17 Aug 2021 07:35:39 -0700
Date: Tue, 17 Aug 2021 15:35:35 +0100
From: Bruce Richardson <bruce.richardson@intel.com>
To: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
Cc: dev@dpdk.org, nick.connolly@mayadata.io, stable@dpdk.org,
Narcisa Vasile <navasile@linux.microsoft.com>
Message-ID: <YRvJN/3O49QkTyNg@bricha3-MOBL.ger.corp.intel.com>
References: <20210810230322.230150-1-dmitry.kozliuk@gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20210810230322.230150-1-dmitry.kozliuk@gmail.com>
Subject: Re: [dpdk-dev] [PATCH] build: fix install from arbitrary directory
for meson 0.55
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
On Wed, Aug 11, 2021 at 02:03:22AM +0300, Dmitry Kozlyuk wrote:
> Install command for meson >= 0.55.0 referenced the script by a plain
> string, assuming the build directory to be directly under the source
> tree root. This resulted in an error when the assumption did not hold:
>
> c:\python\python.exe: can't open file
> '../buildtools/symlink-drivers-solibs.py':
> [Errno 2] No such file or directory
>
> Use files() to make a valid script path for any build directory.
>
> Fixes: cd27047dbee1 ("build: support drivers symlink on Windows")
> Cc: nick.connolly@mayadata.io
> Cc: stable@dpdk.org
>
> Signed-off-by: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
> ---
> Note: this is not limited to Windows, it just happens that Windows
> requires newer meson and the error example is from Windows build.
>
> config/meson.build | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/config/meson.build b/config/meson.build
> index e80421003b..3b5966ec2f 100644
> --- a/config/meson.build
> +++ b/config/meson.build
> @@ -61,7 +61,8 @@ if not is_windows
> get_option('libdir'), pmd_subdir_opt)
> elif meson.version().version_compare('>=0.55.0')
> # 0.55.0 is required to use external program with add_install_script
> - meson.add_install_script(py3, '../buildtools/symlink-drivers-solibs.py',
> + meson.add_install_script(py3,
> + files('../buildtools/symlink-drivers-solibs.py'),
> get_option('libdir'), pmd_subdir_opt, get_option('bindir'))
> endif
>
Rather than using a relative path, we could also use "files()" in the
buildtools directory and store it in a variable to re-use either. Most
other python scripts in the buildtools directory, use that pattern to have
a single (array) variable with the python and script calls together.
Either way as here, or with buildtools change:
Acked-by: Bruce Richardson <bruce.richardson@intel.com>