modules/pkgconfig: make it a NewExtensionModule

Since we no longer need Interpreter.extract_variables, we can remove the
interpreter from the module!
pull/10718/head
Dylan Baker 2 years ago committed by Eli Schwartz
parent 4135925b60
commit a572734330
  1. 10
      mesonbuild/modules/pkgconfig.py

@ -19,7 +19,7 @@ from pathlib import PurePath
import os import os
import typing as T import typing as T
from . import ExtensionModule, ModuleInfo from . import NewExtensionModule, ModuleInfo
from . import ModuleReturnValue from . import ModuleReturnValue
from .. import build from .. import build
from .. import dependencies from .. import dependencies
@ -361,7 +361,7 @@ class DependenciesHelper:
exclude = set() exclude = set()
self.cflags = _fn(self.cflags) self.cflags = _fn(self.cflags)
class PkgConfigModule(ExtensionModule): class PkgConfigModule(NewExtensionModule):
INFO = ModuleInfo('pkgconfig') INFO = ModuleInfo('pkgconfig')
@ -369,8 +369,8 @@ class PkgConfigModule(ExtensionModule):
# variable so that multiple `import()`s share metadata # variable so that multiple `import()`s share metadata
_metadata: T.ClassVar[T.Dict[str, MetaData]] = {} _metadata: T.ClassVar[T.Dict[str, MetaData]] = {}
def __init__(self, interpreter: Interpreter): def __init__(self) -> None:
super().__init__(interpreter) super().__init__()
self.methods.update({ self.methods.update({
'generate': self.generate, 'generate': self.generate,
}) })
@ -737,4 +737,4 @@ class PkgConfigModule(ExtensionModule):
def initialize(interp: Interpreter) -> PkgConfigModule: def initialize(interp: Interpreter) -> PkgConfigModule:
return PkgConfigModule(interp) return PkgConfigModule()

Loading…
Cancel
Save