billchenchina/ognibuild
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Try to resolve 'Python'.

Browse source
This commit is contained in:
Jelmer Vernooij 2021-03-31 01:50:06 +01:00
parent 7326002a37
commit add0ae783c
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ognibuild/resolver/apt.py
View file

@ -300,6 +300,9 @@ vague_map = {
"PythonLibs": "libpython3-dev", "PythonLibs": "libpython3-dev",
"ZLIB": "libz3-dev", "ZLIB": "libz3-dev",
"Osmium": "libosmium2-dev", "Osmium": "libosmium2-dev",
# TODO(jelmer): For Python, check minimum_version and map to python 2 or python 3
"Python": "libpython3-dev",
} }
@ -307,7 +310,7 @@ def resolve_vague_dep_req(apt_mgr, req):
name = req.name name = req.name
options = [] options = []
if name in vague_map: if name in vague_map:
options.append(AptRequirement.simple(vague_map[name])) options.append(AptRequirement.simple(vague_map[name], minimum_version=req.minimum_version))
for x in req.expand(): for x in req.expand():
options.extend(resolve_requirement_apt(apt_mgr, x)) options.extend(resolve_requirement_apt(apt_mgr, x))
return options return options