From 24625921aa35488b26192f5837a56352a84ba756 Mon Sep 17 00:00:00 2001 From: omartijn <44672243+omartijn@users.noreply.github.com> Date: Mon, 15 Mar 2021 23:47:08 +0100 Subject: [PATCH] [applocal.py] Don't try to install dependencies not managed by vcpkg (#16716) This fixes build failures on osx when using dependencies not coming from vcpkg (e.g. closed binaries). vcpkg tried to install those dependencies (which fails because they're not where vcpkg expects them). Fixes issue #8203 Co-authored-by: Martijn Otto --- scripts/buildsystems/osx/applocal.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/scripts/buildsystems/osx/applocal.py b/scripts/buildsystems/osx/applocal.py index e01223c7e7..5237f1fdd0 100644 --- a/scripts/buildsystems/osx/applocal.py +++ b/scripts/buildsystems/osx/applocal.py @@ -259,6 +259,11 @@ def fix_dependency(binary, dep): else: return True + # if the source path doesn't exist it's probably not a dependency + # originating with vcpkg and we should leave it alone + if not os.path.exists(qtnamesrc): + return True + dep_ok = True # check that rpath of 'dep' inside binary has been correctly set # (ie: relative to exepath using '@executable_path' syntax) @@ -417,4 +422,4 @@ def main(): if __name__ == "__main__": - main() \ No newline at end of file + main()