diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-07-06 13:25:56 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-07-06 13:36:24 +0200 |
| commit | a2bbcb707c01342403458fd6bcaac99e99411185 (patch) | |
| tree | e99b29d975b8c34891498ff0e5bbbfe076a73809 /build_scripts/platforms/unix.py | |
| parent | 4b55835767b7aca1b49a8ab1c1966521695abb56 (diff) | |
build scripts: Fix broken packages (rpaths)
The python modules were unable to find the Qt libraries after
401c8134dd84e3ad271c6a0a1e6248cf090d7fe4. This was since the
update_rpath() appends the list of package libraries to the
executables passed in and sets the rpath on them, too. This caused the
libexec-rpath being set on them since the libexec executables
were passed last.
Disentangle this by splitting out a helper to find the package
libraries and call update_rpath() separately for them.
Amends 401c8134dd84e3ad271c6a0a1e6248cf090d7fe4.
Change-Id: I8d647d4e9b1e24e1d6dbc87801bcb4e5fccaf88e
Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'build_scripts/platforms/unix.py')
| -rw-r--r-- | build_scripts/platforms/unix.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/build_scripts/platforms/unix.py b/build_scripts/platforms/unix.py index 153e58af0..4b3ed0db0 100644 --- a/build_scripts/platforms/unix.py +++ b/build_scripts/platforms/unix.py @@ -253,5 +253,6 @@ def prepare_packages_posix(self, vars): if sys.platform.startswith('linux') or sys.platform.startswith('darwin'): rpath_path = "{st_build_dir}/{st_package_name}".format(**vars) self.update_rpath(rpath_path, executables) + self.update_rpath(rpath_path, self.package_libraries(rpath_path)) if libexec_executables: self.update_rpath(rpath_path, libexec_executables, libexec=True) |