Support libtool.
This commit is contained in:
parent
65036278c0
commit
072b845a5e
3 changed files with 16 additions and 0 deletions
|
@ -54,6 +54,7 @@ from buildlog_consultant.common import (
|
||||||
GnomeCommonMissing,
|
GnomeCommonMissing,
|
||||||
MissingGnomeCommonDependency,
|
MissingGnomeCommonDependency,
|
||||||
UnknownCertificateAuthority,
|
UnknownCertificateAuthority,
|
||||||
|
MissingLibtool,
|
||||||
MissingQt,
|
MissingQt,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -90,6 +91,7 @@ from .requirements import (
|
||||||
CertificateAuthorityRequirement,
|
CertificateAuthorityRequirement,
|
||||||
NodeModuleRequirement,
|
NodeModuleRequirement,
|
||||||
QTRequirement,
|
QTRequirement,
|
||||||
|
LibtoolRequirement,
|
||||||
)
|
)
|
||||||
from .resolver import UnsatisfiedRequirements
|
from .resolver import UnsatisfiedRequirements
|
||||||
|
|
||||||
|
@ -147,6 +149,8 @@ def problem_to_upstream_requirement(problem): # noqa: C901
|
||||||
return JRERequirement()
|
return JRERequirement()
|
||||||
elif isinstance(problem, MissingQt):
|
elif isinstance(problem, MissingQt):
|
||||||
return QTRequirement()
|
return QTRequirement()
|
||||||
|
elif isinstance(problem, MissingLibtool):
|
||||||
|
return LibtoolRequirement()
|
||||||
elif isinstance(problem, UnknownCertificateAuthority):
|
elif isinstance(problem, UnknownCertificateAuthority):
|
||||||
return CertificateAuthorityRequirement(problem.url)
|
return CertificateAuthorityRequirement(problem.url)
|
||||||
elif isinstance(problem, MissingGnomeCommonDependency):
|
elif isinstance(problem, MissingGnomeCommonDependency):
|
||||||
|
|
|
@ -459,6 +459,12 @@ class AutoconfMacroRequirement(Requirement):
|
||||||
self.macro = macro
|
self.macro = macro
|
||||||
|
|
||||||
|
|
||||||
|
class LibtoolRequirement(Requirement):
|
||||||
|
|
||||||
|
def __init__(self):
|
||||||
|
super(LibtoolRequirement, self).__init__("libtool")
|
||||||
|
|
||||||
|
|
||||||
class PythonModuleRequirement(Requirement):
|
class PythonModuleRequirement(Requirement):
|
||||||
|
|
||||||
module: str
|
module: str
|
||||||
|
|
|
@ -62,6 +62,7 @@ from ..requirements import (
|
||||||
PythonModuleRequirement,
|
PythonModuleRequirement,
|
||||||
PythonPackageRequirement,
|
PythonPackageRequirement,
|
||||||
CertificateAuthorityRequirement,
|
CertificateAuthorityRequirement,
|
||||||
|
LibtoolRequirement,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@ -440,6 +441,10 @@ def resolve_qt_req(apt_mgr, req):
|
||||||
return find_reqs_simple(apt_mgr, ["/usr/lib/.*/qt[0-9]+/bin/qmake"], regex=True)
|
return find_reqs_simple(apt_mgr, ["/usr/lib/.*/qt[0-9]+/bin/qmake"], regex=True)
|
||||||
|
|
||||||
|
|
||||||
|
def resolve_libtool_req(apt_mgr, req):
|
||||||
|
return [AptRequirement.simple("libtool")]
|
||||||
|
|
||||||
|
|
||||||
def resolve_perl_module_req(apt_mgr, req):
|
def resolve_perl_module_req(apt_mgr, req):
|
||||||
DEFAULT_PERL_PATHS = ["/usr/share/perl5"]
|
DEFAULT_PERL_PATHS = ["/usr/share/perl5"]
|
||||||
|
|
||||||
|
@ -545,6 +550,7 @@ APT_REQUIREMENT_RESOLVERS = [
|
||||||
(JDKRequirement, resolve_jdk_req),
|
(JDKRequirement, resolve_jdk_req),
|
||||||
(JRERequirement, resolve_jre_req),
|
(JRERequirement, resolve_jre_req),
|
||||||
(QTRequirement, resolve_qt_req),
|
(QTRequirement, resolve_qt_req),
|
||||||
|
(LibtoolRequirement, resolve_libtool_req),
|
||||||
(PerlModuleRequirement, resolve_perl_module_req),
|
(PerlModuleRequirement, resolve_perl_module_req),
|
||||||
(PerlFileRequirement, resolve_perl_file_req),
|
(PerlFileRequirement, resolve_perl_file_req),
|
||||||
(AutoconfMacroRequirement, resolve_autoconf_macro_req),
|
(AutoconfMacroRequirement, resolve_autoconf_macro_req),
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue