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

Fix ExtraFrameworkDependency Framework detection 

The name splitting was wrong and would not incorrectly handle folders
with two dots, like Foo.framework.dSYM and treat this as 'Foo' instead
of 'Foo.framework', which would lead to meson detecting dSYM bundles
as frameworks and try to use those like a framework, which is wrong.

Fix #3793
This commit is contained in:
Marvin Scholz 2018-06-26 13:12:07 +02:00 committed by Jussi Pakkanen
parent 8b12a71f22
commit 3232806b08
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mesonbuild/dependencies/base.py
View File

@ -1003,7 +1003,7 @@ class ExtraFrameworkDependency(ExternalDependency):
for p in paths: for p in paths:
for d in os.listdir(p): for d in os.listdir(p):
fullpath = os.path.join(p, d) fullpath = os.path.join(p, d)
if lname != d.split('.')[0].lower(): if lname != d.rsplit('.', 1)[0].lower():
continue continue
if not stat.S_ISDIR(os.stat(fullpath).st_mode): if not stat.S_ISDIR(os.stat(fullpath).st_mode):
continue continue