diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2024-02-06 11:21:34 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2024-02-06 14:00:32 +0000 |
| commit | 118a932d0be9f28e773953e68466214a78c83023 (patch) | |
| tree | 4844a35504f14038448b7f512a665280e8da062c | |
| parent | 1272d2bd41eafc60cb9fe902e26c01d67a1adc4f (diff) | |
build/Linux: Fix shiboken6 failing to launch due to missing libicu
Also ship ICU for the shiboken generator.
Amends 43fe3494a9d902034896e3afa7b5158c77163be0.
Pick-to: 6.6.2 6.5 6.2
Task-number: PYSIDE-749
Change-Id: Ib5529693fde51f245a90be0ae4a56139e3aadf45
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Reviewed-by: Adrian Herrmann <adrian.herrmann@qt.io>
(cherry picked from commit 677839164f424e8cd844d4ff8b81c3a3297af1f3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | build_scripts/platforms/linux.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/build_scripts/platforms/linux.py b/build_scripts/platforms/linux.py index 835cc4dd0..cb388e8aa 100644 --- a/build_scripts/platforms/linux.py +++ b/build_scripts/platforms/linux.py @@ -19,7 +19,6 @@ def prepare_standalone_package_linux(pyside_build, _vars, cross_build=False, is_ copy_qml = True copy_translations = True copy_qt_conf = True - should_copy_icu_libs = True log.info("Copying files...") @@ -29,7 +28,6 @@ def prepare_standalone_package_linux(pyside_build, _vars, cross_build=False, is_ copy_qml = False copy_translations = False copy_qt_conf = False - should_copy_icu_libs = False # <qt>/lib/* -> <setup>/{st_package_name}/Qt/lib destination_dir = Path("{st_build_dir}/{st_package_name}".format(**_vars)) @@ -55,7 +53,7 @@ def prepare_standalone_package_linux(pyside_build, _vars, cross_build=False, is_ _filter=accepted_modules, recursive=False, _vars=_vars, force_copy_symlinks=True) - if should_copy_icu_libs and not cross_build and not is_android: + if not cross_build and not is_android: # Check if ICU libraries were copied over to the destination # Qt libdir. maybe_icu_libs = find_files_using_glob(destination_qt_lib_dir, "libicu*") |