From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 83745A0C53 for ; Wed, 18 Aug 2021 22:55:39 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7816E4117D; Wed, 18 Aug 2021 22:55:39 +0200 (CEST) Received: from mail-lj1-f177.google.com (mail-lj1-f177.google.com [209.85.208.177]) by mails.dpdk.org (Postfix) with ESMTP id 0E7EB40140; Wed, 18 Aug 2021 22:55:36 +0200 (CEST) Received: by mail-lj1-f177.google.com with SMTP id c12so7493686ljr.5; Wed, 18 Aug 2021 13:55:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rwLBLngi69QRPtYObfDeOfZ7cRFM5LeBxT7VdOr/XmM=; b=LXrk+bb0wsUtKYP4lPpgxVnQyiefgxonWsv+55rqYrlxjISimqivQD7mb6mvvfvPHe u9mztF6bJIwRgMdHOb0qa5TcDCKTDaq2YNwsNtnPg8AClnP69idp9XKAOLbC01F1QDFh caIjwsd3b29wVI6a3bDtdVmnAfmTt2SqmtFPNATDenVzj25rU573upsF/NOaOXuRVftL AFcGqE2h8mClZRalgNFj50sazR6JZNHpEBEcda43ziejQg1ABrIu/VeuY4pC1z1UMlbH wnse41HBemXFDTu0qLfsxIDsRk8AIrWv1KZFYWjLfhhySHMKJfRvpb/rMzu+vu2ZgDfX +Yww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rwLBLngi69QRPtYObfDeOfZ7cRFM5LeBxT7VdOr/XmM=; b=DoxNOVr5lgP9HvqdrPFq2ZXWKDEm1ybl2UyQxbsbD4MrT/0uq2bh5UhGepo9UZpdpB y0UxCo4Ia+xgSQgj1JJwwKwY0ul8bXa1wASjkcp0jfkBYLFcVR5B5SymISmJUsUyPB8L 0lRY8+BmZJEpMeQMqU1P5XxEgQ8tLByuoij4LQKNcERgpiUsHPKR5hnlB2KL3KBYPg1s aT7BV57VnUdz6XvgoKutawBQIjAzp74TwANHmvQYKZ46fB0yTUX0UBFmhZ8s6uUE+2nK 8hbSEwefQ2KibBS/19p6Y983zc4He/VpKljifEmIoJQCciisJ6vupdXlbR9z9goM7fRu ZoPg== X-Gm-Message-State: AOAM5314RTOZjnchscXCebDFPaqaYzowVSYPeloeRY+ckKLqc3V1GsZi T+8EdBxaZkpQ+tEqSj4vdGg= X-Google-Smtp-Source: ABdhPJwIEpBWMTuAlz8RH6vLOllf+vHGHpuBp47lcNn+hOm6pSwrcKgsUT7gY9eepczxYZG0s49U2g== X-Received: by 2002:a2e:3806:: with SMTP id f6mr9583333lja.355.1629320135499; Wed, 18 Aug 2021 13:55:35 -0700 (PDT) Received: from sovereign (broadband-37-110-65-23.ip.moscow.rt.ru. [37.110.65.23]) by smtp.gmail.com with ESMTPSA id l30sm75209lfj.42.2021.08.18.13.55.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Aug 2021 13:55:34 -0700 (PDT) Date: Wed, 18 Aug 2021 23:55:33 +0300 From: Dmitry Kozlyuk To: Bruce Richardson Cc: dev@dpdk.org, nick.connolly@mayadata.io, stable@dpdk.org, Narcisa Vasile Message-ID: <20210818235533.768302dc@sovereign> In-Reply-To: References: <20210810230322.230150-1-dmitry.kozliuk@gmail.com> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [dpdk-stable] [PATCH] build: fix install from arbitrary directory for meson 0.55 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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" 2021-08-17 15:35 (UTC+0100), Bruce Richardson: > 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 > > --- > > 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. Thanks for the hint, but I don't think consistency is worth it. Now we have some non-trivial logic (otherwise it wouldn't need comments) in one place. With variable definition affected by the single use case in another file it will be harder to understand the reason. > Either way as here, or with buildtools change: > > Acked-by: Bruce Richardson