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

R: Handle minimum versions and LinkingTo field.

Browse source
This commit is contained in:
Jelmer Vernooij 2021-03-30 18:23:31 +01:00
parent 19ca52908e
commit dc9a521a73
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
ognibuild/buildsystem.py
View file

@ -709,6 +709,9 @@ class R(BuildSystem):
if "Imports" in description: if "Imports" in description:
for s in parse_list(description["Imports"]): for s in parse_list(description["Imports"]):
yield "build", RPackageRequirement.from_str(s) yield "build", RPackageRequirement.from_str(s)
if "LinkingTo" in description:
for s in parse_list(description["LinkingTo"]):
yield "build", RPackageRequirement.from_str(s)
def get_declared_outputs(self, session, fixers=None): def get_declared_outputs(self, session, fixers=None):
description = self._read_description() description = self._read_description()

2
ognibuild/resolver/apt.py
View file

@ -396,7 +396,7 @@ def resolve_r_package_req(apt_mgr, req):
paths = [ paths = [
posixpath.join("/usr/lib/R/site-library/.*/R/%s$" % re.escape(req.package)) posixpath.join("/usr/lib/R/site-library/.*/R/%s$" % re.escape(req.package))
] ]
return find_reqs_simple(apt_mgr, paths, regex=True) return find_reqs_simple(apt_mgr, paths, regex=True, minimum_version=req.minimum_version)
def resolve_node_module_req(apt_mgr, req): def resolve_node_module_req(apt_mgr, req):