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

cmake: fix detection of libraries with .so version

This commit is contained in:
Daniel Mensinger 2019-10-03 15:25:25 +02:00
parent 8d3fcb3dc4
commit 8103af1d76
No known key found for this signature in database
GPG Key ID: 54DD94C131E277D4
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
mesonbuild/cmake/interpreter.py
View File

@ -22,7 +22,7 @@ from .traceparser import CMakeTraceParser, CMakeGeneratorTarget
from .. import mlog from .. import mlog
from ..environment import Environment from ..environment import Environment
from ..mesonlib import MachineChoice from ..mesonlib import MachineChoice
from ..compilers.compilers import lang_suffixes, header_suffixes, obj_suffixes, is_header from ..compilers.compilers import lang_suffixes, header_suffixes, obj_suffixes, lib_suffixes, is_header
from subprocess import Popen, PIPE from subprocess import Popen, PIPE
from typing import Any, List, Dict, Optional, TYPE_CHECKING from typing import Any, List, Dict, Optional, TYPE_CHECKING
from threading import Thread from threading import Thread
@ -117,6 +117,7 @@ def _generated_file_key(fname: str) -> str:
class ConverterTarget: class ConverterTarget:
lang_cmake_to_meson = {val.lower(): key for key, val in language_map.items()} lang_cmake_to_meson = {val.lower(): key for key, val in language_map.items()}
rm_so_version = re.compile(r'(\.[0-9]+)+$')
def __init__(self, target: CMakeTarget, env: Environment): def __init__(self, target: CMakeTarget, env: Environment):
self.env = env self.env = env
@ -211,15 +212,30 @@ class ConverterTarget:
mlog.warning('CMake: Target', mlog.bold(self.name), 'not found in CMake trace. This can lead to build errors') mlog.warning('CMake: Target', mlog.bold(self.name), 'not found in CMake trace. This can lead to build errors')
# Fix link libraries # Fix link libraries
def try_resolve_link_with(path: str) -> Optional[str]:
basename = os.path.basename(path)
candidates = [basename, ConverterTarget.rm_so_version.sub('', basename)]
for i in lib_suffixes:
if not basename.endswith('.' + i):
continue
new_basename = basename[:-len(i) - 1]
new_basename = ConverterTarget.rm_so_version.sub('', new_basename)
new_basename = '{}.{}'.format(new_basename, i)
candidates += [new_basename]
for i in candidates:
if i in output_target_map:
return output_target_map[i]
return None
temp = [] temp = []
for i in self.link_libraries: for i in self.link_libraries:
# Let meson handle this arcane magic # Let meson handle this arcane magic
if ',-rpath,' in i: if ',-rpath,' in i:
continue continue
if not os.path.isabs(i): if not os.path.isabs(i):
basename = os.path.basename(i) link_with = try_resolve_link_with(i)
if basename in output_target_map: if link_with:
self.link_with += [output_target_map[basename]] self.link_with += [link_with]
continue continue
temp += [i] temp += [i]

2
mesonbuild/compilers/compilers.py
View File

@ -39,7 +39,7 @@ Also add corresponding autodetection code in environment.py."""
header_suffixes = ('h', 'hh', 'hpp', 'hxx', 'H', 'ipp', 'moc', 'vapi', 'di') header_suffixes = ('h', 'hh', 'hpp', 'hxx', 'H', 'ipp', 'moc', 'vapi', 'di')
obj_suffixes = ('o', 'obj', 'res') obj_suffixes = ('o', 'obj', 'res')
lib_suffixes = ('a', 'lib', 'dll', 'dylib', 'so') lib_suffixes = ('a', 'lib', 'dll', 'dll.a', 'dylib', 'so')
# Mapping of language to suffixes of files that should always be in that language # Mapping of language to suffixes of files that should always be in that language
# This means we can't include .h headers here since they could be C, C++, ObjC, etc. # This means we can't include .h headers here since they could be C, C++, ObjC, etc.
lang_suffixes = { lang_suffixes = {