diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-06-16 09:43:28 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-06-16 13:10:43 +0200 |
| commit | e284e630bf57338a1f02323a2f8c3d126a4c5769 (patch) | |
| tree | 9b8b4ff957a22808b8bab04e6c6d4b1fb650e410 /build_scripts/platforms/linux.py | |
| parent | cd1022b1216dbf67bb553b7fc65106d91e95643d (diff) | |
build scripts: Extract helper functions to patch executables
Prepare for adding more binaries.
Task-number: PYSIDE-1378
Change-Id: I1e3a39db28da19fe9a307145d599d7448428652d
Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'build_scripts/platforms/linux.py')
| -rw-r--r-- | build_scripts/platforms/linux.py | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/build_scripts/platforms/linux.py b/build_scripts/platforms/linux.py index cafddbc07..442506d81 100644 --- a/build_scripts/platforms/linux.py +++ b/build_scripts/platforms/linux.py @@ -38,7 +38,7 @@ ############################################################################# from ..utils import (copydir, copyfile, copy_icu_libs, find_files_using_glob, - linux_set_rpaths, linux_get_rpaths, rpaths_has_origin) + linux_patch_executable) from ..config import config from ..versions import PYSIDE @@ -91,11 +91,7 @@ def prepare_standalone_package_linux(self, vars): # Patching designer to use the Qt libraries provided in the wheel if config.is_internal_pyside_build(): designer_path = "{st_build_dir}/{st_package_name}/designer".format(**vars) - rpaths = linux_get_rpaths(designer_path) - if not rpaths or not rpaths_has_origin(rpaths): - rpaths.insert(0, '$ORIGIN/../lib') - new_rpaths_string = ":".join(rpaths) - linux_set_rpaths(self._patchelf_path, designer_path, new_rpaths_string) + linux_patch_executable(self._patchelf_path, designer_path) if self.is_webengine_built(built_modules): copydir("{qt_lib_execs_dir}", |