From 6aceb7e2d6053a80af88280c7006baec1d25be55 Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Tue, 25 Jul 2023 13:28:34 -0400 Subject: [PATCH] packaging: fix regression that prevented pyinstaller from getting custom deps mesonbuild.dependencies.* is now lazy-imported and not automatically detected. Add them as hidden imports. Fixes #12036 --- packaging/hook-mesonbuild.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packaging/hook-mesonbuild.py b/packaging/hook-mesonbuild.py index 86e74639f..d6b06cd26 100644 --- a/packaging/hook-mesonbuild.py +++ b/packaging/hook-mesonbuild.py @@ -25,7 +25,11 @@ datas += collect_data_files('mesonbuild.scripts', include_py_files=True, exclude datas += collect_data_files('mesonbuild.cmake.data') datas += collect_data_files('mesonbuild.dependencies.data') +# lazy-loaded +hiddenimports += get_all_modules_from_dir('mesonbuild/dependencies') +# imported by meson.build files hiddenimports += get_all_modules_from_dir('mesonbuild/modules') +# executed when named on CLI hiddenimports += get_all_modules_from_dir('mesonbuild/scripts') # Python packagers want to be minimal and only copy the things