On Wed, Oct 27, 2021 at 07:45:28PM +0300, Dmitry Kozlyuk wrote:
> 2021-10-27 17:16 (UTC+0100), Bruce Richardson:
> > 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: sta...@dpdk.org
> > >
> > > Reported-by: Michal Berger <michallinuxst...@gmail.com>
> > > Signed-off-by: Dmitry Kozlyuk <dmitry.kozl...@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)
> >
>
> It buys with simplicity.
> I hoped to avoid creating temporary directories in vain
> when all archives are thin, but maybe it's not that important.
Since the temp directory is contained within the build directory, I don't
think it matters. If you don't mind then, I'll do up a v2 patch with my
alternative fix and submit that to the list.
Regards,
/Bruce
