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 2AA5DA0C47;
Wed, 27 Oct 2021 18:16:26 +0200 (CEST)
Received: from [217.70.189.124] (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id EC12840E0F;
Wed, 27 Oct 2021 18:16:25 +0200 (CEST)
Received: from mga18.intel.com (mga18.intel.com [134.134.136.126])
by mails.dpdk.org (Postfix) with ESMTP id 12A8140DDA;
Wed, 27 Oct 2021 18:16:23 +0200 (CEST)
X-IronPort-AV: E=McAfee;i="6200,9189,10150"; a="217110365"
X-IronPort-AV: E=Sophos;i="5.87,187,1631602800"; d="scan'208";a="217110365"
Received: from orsmga007.jf.intel.com ([10.7.209.58])
by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;
27 Oct 2021 09:16:21 -0700
X-IronPort-AV: E=Sophos;i="5.87,187,1631602800"; d="scan'208";a="486740840"
Received: from bricha3-mobl.ger.corp.intel.com ([10.252.16.125])
by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-SHA;
27 Oct 2021 09:16:19 -0700
Date: Wed, 27 Oct 2021 17:16:16 +0100
From: Bruce Richardson <bruce.richardson@intel.com>
To: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
Cc: dev@dpdk.org, stable@dpdk.org,
Michal Berger <michallinuxstuff@gmail.com>, thomas@monjalon.net
Message-ID: <YXl7UJ1LYYNeX0/Z@bricha3-MOBL.ger.corp.intel.com>
References: <20211026193239.113745-1-dmitry.kozliuk@gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20211026193239.113745-1-dmitry.kozliuk@gmail.com>
Subject: Re: [dpdk-dev] [PATCH] buildtools: fix build with meson 0.60
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 Tue, Oct 26, 2021 at 10:32:39PM +0300, Dmitry Kozlyuk wrote:
> Meson 0.60 switched the format of uninstalled static libraries
> to thin archives, that is, they contain only paths to object files,
> not the files themselves. Files cannot be extracted in this case,
> resulting in build errors:
>
> ar: `x' cannot be used on thin archives.
>
> Handle thin archives when invoking pmdinfogen
> by directly using the files referenced in the archive.
>
> Bugzilla ID: 836
> Fixes: e6e9730c7066 ("buildtools: support object file extraction for Windows")
> Cc: stable@dpdk.org
>
> Reported-by: Michal Berger <michallinuxstuff@gmail.com>
> Signed-off-by: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
> ---
> buildtools/gen-pmdinfo-cfile.py | 23 ++++++++++++++---------
> 1 file changed, 14 insertions(+), 9 deletions(-)
>
Here is an alternative fix that works in my testing, based on my earlier
suggestion:
Regards,
/Bruce
diff --git a/buildtools/gen-pmdinfo-cfile.py b/buildtools/gen-pmdinfo-cfile.py
index 58fe3ad152..5fbd51658a 100644
--- a/buildtools/gen-pmdinfo-cfile.py
+++ b/buildtools/gen-pmdinfo-cfile.py
@@ -9,12 +9,13 @@
_, tmp_root, ar, archive, output, *pmdinfogen = sys.argv
with tempfile.TemporaryDirectory(dir=tmp_root) as temp:
- run_ar = lambda command: subprocess.run(
- [ar, command, os.path.abspath(archive)],
- stdout=subprocess.PIPE, check=True, cwd=temp
- )
- # Don't use "ar p", because its output is corrupted on Windows.
- run_ar("x")
- names = run_ar("t").stdout.decode().splitlines()
- paths = [os.path.join(temp, name) for name in names]
+ paths = []
+ for name in subprocess.run([ar, "t", archive], stdout=subprocess.PIPE,
+ check=True).stdout.decode().splitlines():
+ if os.path.exists(name):
+ paths.append(name)
+ else:
+ subprocess.run([ar, "x", os.path.abspath(archive), name],
+ check=True, cwd=temp)
+ paths.append(os.path.join(temp, name))
subprocess.run(pmdinfogen + paths + [output], check=True)