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

env2mfile: Take pkg-config properties from env

This commit is contained in:
Xavier Claessens 2023-03-21 10:16:30 -04:00 committed by Eli Schwartz
parent 62a5673b98
commit dbb857dd71
No known key found for this signature in database
GPG Key ID: CEB167EFB5722BD6
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mesonbuild/scripts/env2mfile.py
View File

@ -297,6 +297,14 @@ def detect_binaries_from_envvars(infos: MachineInfo, envvar_suffix: str = '') ->
if binstr:
infos.binaries[binname] = shlex.split(binstr)
def detect_properties_from_envvars(infos: MachineInfo, envvar_suffix: str = '') -> None:
var = os.environ.get('PKG_CONFIG_LIBDIR' + envvar_suffix)
if var is not None:
infos.properties['pkg_config_libdir'] = var
var = os.environ.get('PKG_CONFIG_SYSROOT_DIR' + envvar_suffix)
if var is not None:
infos.properties['sys_root'] = var
def detect_cross_system(infos: MachineInfo, options: T.Any) -> None:
for optname in ('system', 'cpu', 'cpu_family', 'endian'):
v = getattr(options, optname)
@ -314,6 +322,7 @@ def detect_cross_env(options: T.Any) -> MachineInfo:
infos = detect_compilers_from_envvars()
detect_cross_system(infos, options)
detect_binaries_from_envvars(infos)
detect_properties_from_envvars(infos)
return infos
def add_compiler_if_missing(infos: MachineInfo, langname: str, exe_names: T.List[str]) -> None:
@ -359,6 +368,7 @@ def detect_native_env(options: T.Any) -> MachineInfo:
detect_missing_native_compilers(infos)
detect_binaries_from_envvars(infos, esuffix)
detect_missing_native_binaries(infos)
detect_properties_from_envvars(infos, esuffix)
return infos
def run(options: T.Any) -> None: