dependencies: find extraframeworks on case-sensitive filesystems

Fixes a test failure on case-sensitive filesystems when a CMake
dependency is turned into an Apple framework.
pull/13086/merge
Randy Eckenrode 8 months ago committed by Jussi Pakkanen
parent 0fade02fe2
commit f01ae52bc2
  1. 9
      mesonbuild/dependencies/framework.py
  2. 5
      test cases/osx/11 case sensitive apfs/meson.build
  3. 3
      test cases/osx/11 case sensitive apfs/prog.c
  4. 5
      test cases/osx/11 case sensitive apfs/test.json

@ -47,6 +47,7 @@ class ExtraFrameworkDependency(ExternalDependency):
framework_path = self._get_framework_path(p, name) framework_path = self._get_framework_path(p, name)
if framework_path is None: if framework_path is None:
continue continue
framework_name = framework_path.stem
# We want to prefer the specified paths (in order) over the system # We want to prefer the specified paths (in order) over the system
# paths since these are "extra" frameworks. # paths since these are "extra" frameworks.
# For example, Python2's framework is in /System/Library/Frameworks and # For example, Python2's framework is in /System/Library/Frameworks and
@ -54,11 +55,15 @@ class ExtraFrameworkDependency(ExternalDependency):
# Python.framework. We need to know for sure that the framework was # Python.framework. We need to know for sure that the framework was
# found in the path we expect. # found in the path we expect.
allow_system = p in self.system_framework_paths allow_system = p in self.system_framework_paths
args = self.clib_compiler.find_framework(name, self.env, [p], allow_system) args = self.clib_compiler.find_framework(framework_name, self.env, [p], allow_system)
if args is None: if args is None:
continue continue
self.link_args = args self.link_args = args
self.framework_path = framework_path.as_posix() self.framework_path = framework_path.as_posix()
# The search is done case-insensitively, so the found name may differ
# from the one that was requested. Setting the name ensures the correct
# one is used when linking on case-sensitive filesystems.
self.name = framework_name
self.compile_args = ['-F' + self.framework_path] self.compile_args = ['-F' + self.framework_path]
# We need to also add -I includes to the framework because all # We need to also add -I includes to the framework because all
# cross-platform projects such as OpenGL, Python, Qt, GStreamer, # cross-platform projects such as OpenGL, Python, Qt, GStreamer,
@ -74,7 +79,7 @@ class ExtraFrameworkDependency(ExternalDependency):
p = Path(path) p = Path(path)
lname = name.lower() lname = name.lower()
for d in p.glob('*.framework/'): for d in p.glob('*.framework/'):
if lname == d.name.rsplit('.', 1)[0].lower(): if lname == d.stem.lower():
return d return d
return None return None

@ -0,0 +1,5 @@
project('case-sensitive APFS with extra frameworks test', 'c')
dep = dependency('FoUnDaTiOn')
exe = executable('prog', 'prog.c', install : true, dependencies: dep)

@ -0,0 +1,3 @@
int main(void) {
return 0;
}

@ -0,0 +1,5 @@
{
"installed": [
{"type": "file", "file": "usr/bin/prog"}
]
}
Loading…
Cancel
Save