aboutsummaryrefslogtreecommitdiff
path: root/packaging
diff options
context:
space:
mode:
authorEli Schwartz <eschwartz@archlinux.org>2023-07-25 13:28:34 -0400
committerEli Schwartz <eschwartz@archlinux.org>2023-07-25 13:29:29 -0400
commit6aceb7e2d6053a80af88280c7006baec1d25be55 (patch)
treef9302970181f279fffb97a59ec7d144abc036bb0 /packaging
parent1a182ab59919d4838613f9d1962623447636663e (diff)
downloadmeson-6aceb7e2d6053a80af88280c7006baec1d25be55.zip
meson-6aceb7e2d6053a80af88280c7006baec1d25be55.tar.gz
meson-6aceb7e2d6053a80af88280c7006baec1d25be55.tar.bz2
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
Diffstat (limited to 'packaging')
-rw-r--r--packaging/hook-mesonbuild.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/packaging/hook-mesonbuild.py b/packaging/hook-mesonbuild.py
index 86e7463..d6b06cd 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