diff options
| author | Marvin Scholz <epirat07@gmail.com> | 2018-06-26 13:12:07 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2018-06-27 01:17:15 +0300 |
| commit | 3232806b087da3469fd35148d62597f9cd09ea96 (patch) | |
| tree | e061aea0016f412345a42ccf200a3fad879ff2fb | |
| parent | 8b12a71f22e0f0770b31bc4c94cdab519e014dd4 (diff) | |
| download | meson-3232806b087da3469fd35148d62597f9cd09ea96.tar.gz | |
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
| -rw-r--r-- | mesonbuild/dependencies/base.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py index 151d2b9d8..3bff0d231 100644 --- a/mesonbuild/dependencies/base.py +++ b/mesonbuild/dependencies/base.py @@ -1003,7 +1003,7 @@ class ExtraFrameworkDependency(ExternalDependency): for p in paths: for d in os.listdir(p): fullpath = os.path.join(p, d) - if lname != d.split('.')[0].lower(): + if lname != d.rsplit('.', 1)[0].lower(): continue if not stat.S_ISDIR(os.stat(fullpath).st_mode): continue |
