d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

buildtools: fix build with Meson 0.60

Browse Source 
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, when they already exist, and extracting
them if not.

Bugzilla ID: 836
Fixes: e6e9730c70 ("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>
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
This commit is contained in:
Bruce Richardson 2021-11-01 17:03:26 +00:00 committed by Thomas Monjalon
parent 53caecb844
commit c78471cd06
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
buildtools/gen-pmdinfo-cfile.py
View File

@ -9,12 +9,13 @@
_, tmp_root, ar, archive, output, *pmdinfogen = sys.argv _, tmp_root, ar, archive, output, *pmdinfogen = sys.argv
with tempfile.TemporaryDirectory(dir=tmp_root) as temp: with tempfile.TemporaryDirectory(dir=tmp_root) as temp:
run_ar = lambda command: subprocess.run( paths = []
[ar, command, os.path.abspath(archive)], for name in subprocess.run([ar, "t", archive], stdout=subprocess.PIPE,
stdout=subprocess.PIPE, check=True, cwd=temp check=True).stdout.decode().splitlines():
) if os.path.exists(name):
# Don't use "ar p", because its output is corrupted on Windows. paths.append(name)
run_ar("x") else:
names = run_ar("t").stdout.decode().splitlines() subprocess.run([ar, "x", os.path.abspath(archive), name],
paths = [os.path.join(temp, name) for name in names] check=True, cwd=temp)
paths.append(os.path.join(temp, name))
subprocess.run(pmdinfogen + paths + [output], check=True) subprocess.run(pmdinfogen + paths + [output], check=True)