Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

modules: get rid of the .*machine variables 

They're hardly used, and can be gotten directly from the Environment
instead
This commit is contained in:
Dylan Baker 2023-12-22 10:05:17 -08:00
parent 7cbaa6613a
commit 6ccd708f30
4 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mesonbuild/modules/__init__.py
View File

@ -16,7 +16,6 @@ from ..programs import ExternalProgram
if T.TYPE_CHECKING: if T.TYPE_CHECKING:
from ..interpreter import Interpreter from ..interpreter import Interpreter
from ..interpreter.interpreter import ProgramVersionFunc from ..interpreter.interpreter import ProgramVersionFunc
from ..interpreter.interpreterobjects import MachineHolder
from ..interpreterbase import TYPE_var, TYPE_kwargs from ..interpreterbase import TYPE_var, TYPE_kwargs
from ..programs import OverrideProgram from ..programs import OverrideProgram
from ..wrap import WrapMode from ..wrap import WrapMode
@ -52,9 +51,6 @@ class ModuleState:
self.man = interpreter.build.get_man() self.man = interpreter.build.get_man()
self.global_args = interpreter.build.global_args.host self.global_args = interpreter.build.global_args.host
self.project_args = interpreter.build.projects_args.host.get(interpreter.subproject, {}) self.project_args = interpreter.build.projects_args.host.get(interpreter.subproject, {})
self.build_machine = T.cast('MachineHolder', interpreter.builtin['build_machine']).held_object
self.host_machine = T.cast('MachineHolder', interpreter.builtin['host_machine']).held_object
self.target_machine = T.cast('MachineHolder', interpreter.builtin['target_machine']).held_object
self.current_node = interpreter.current_node self.current_node = interpreter.current_node
def get_include_args(self, include_dirs: T.Iterable[T.Union[str, build.IncludeDirs]], prefix: str = '-I') -> T.List[str]: def get_include_args(self, include_dirs: T.Iterable[T.Union[str, build.IncludeDirs]], prefix: str = '-I') -> T.List[str]:

2
mesonbuild/modules/cuda.py
View File

@ -82,7 +82,7 @@ class CudaModule(NewExtensionModule):
driver_version = 'unknown' driver_version = 'unknown'
for d in driver_version_table: for d in driver_version_table:
if version_compare(cuda_version, d['cuda_version']): if version_compare(cuda_version, d['cuda_version']):
driver_version = d.get(state.host_machine.system, d['linux']) driver_version = d.get(state.environment.machines.host.system, d['linux'])
break break
return driver_version return driver_version

8
mesonbuild/modules/external_project.py
View File

@ -65,8 +65,6 @@ class ExternalProject(NewExtensionModule):
self.project_version = state.project_version self.project_version = state.project_version
self.subproject = state.subproject self.subproject = state.subproject
self.env = state.environment self.env = state.environment
self.build_machine = state.build_machine
self.host_machine = state.host_machine
self.configure_command = configure_command self.configure_command = configure_command
self.configure_options = configure_options self.configure_options = configure_options
self.cross_configure_options = cross_configure_options self.cross_configure_options = cross_configure_options
@ -126,10 +124,10 @@ class ExternalProject(NewExtensionModule):
configure_cmd += self._format_options(self.configure_options, d) configure_cmd += self._format_options(self.configure_options, d)
if self.env.is_cross_build(): if self.env.is_cross_build():
host = '{}-{}-{}'.format(self.host_machine.cpu, host = '{}-{}-{}'.format(state.environment.machines.host.cpu,
'pc' if self.host_machine.cpu_family in {"x86", "x86_64"} 'pc' if state.environment.machines.host.cpu_family in {"x86", "x86_64"}
else 'unknown', else 'unknown',
self.host_machine.system) state.environment.machines.host.system)
d = [('HOST', None, host)] d = [('HOST', None, host)]
configure_cmd += self._format_options(self.cross_configure_options, d) configure_cmd += self._format_options(self.cross_configure_options, d)

2
mesonbuild/modules/python3.py
View File

@ -41,7 +41,7 @@ class Python3Module(ExtensionModule):
@typed_pos_args('python3.extension_module', str, varargs=(str, mesonlib.File, CustomTarget, CustomTargetIndex, GeneratedList, StructuredSources, ExtractedObjects, BuildTarget)) @typed_pos_args('python3.extension_module', str, varargs=(str, mesonlib.File, CustomTarget, CustomTargetIndex, GeneratedList, StructuredSources, ExtractedObjects, BuildTarget))
@typed_kwargs('python3.extension_module', *_MOD_KWARGS, allow_unknown=True) @typed_kwargs('python3.extension_module', *_MOD_KWARGS, allow_unknown=True)
def extension_module(self, state: ModuleState, args: T.Tuple[str, T.List[BuildTargetSource]], kwargs: SharedModuleKW): def extension_module(self, state: ModuleState, args: T.Tuple[str, T.List[BuildTargetSource]], kwargs: SharedModuleKW):
host_system = state.host_machine.system host_system = state.environment.machines.host.system
if host_system == 'darwin': if host_system == 'darwin':
# Default suffix is 'dylib' but Python does not use it for extensions. # Default suffix is 'dylib' but Python does not use it for extensions.
suffix = 'so' suffix = 'so'