diff options
| author | Simon McVittie <smcv@debian.org> | 2019-08-30 17:05:40 +0000 |
|---|---|---|
| committer | Michael Catanzaro <mcatanzaro@gnome.org> | 2019-08-31 09:28:10 +0000 |
| commit | 656cebbf905d145cf676a2e9fc51784ddae3fe47 (patch) | |
| tree | 50c03770b8f2ef14b69bebd1f48358fdd7ca2e8e | |
| parent | 0d77584dc5f6aa46d5e726fd19352aef526b111b (diff) | |
| download | epiphany-656cebbf905d145cf676a2e9fc51784ddae3fe47.tar.gz | |
build: Give all libraries a RUNPATH for our private libraries
Setting a RUNPATH on a loadable module like libephywebextension is
enough to search that directory for private libraries that it directly
depends on, but not enough to search that directory for those libraries'
dependencies, such as libephymisc loading the bundled libdazzle on the
3.32 branch. Address this by giving libephymisc its own RUNPATH so it
loads the correct dependencies.
For completeness, do the same for all private shared libraries that
didn't already have install_rpath.
Signed-off-by: Simon McVittie <smcv@debian.org>
Bug-Debian: https://bugs.debian.org/927731
(cherry picked from commit a93b4da656c799375c88c0050733ea9bf8efed55)
| -rw-r--r-- | lib/meson.build | 3 | ||||
| -rw-r--r-- | lib/sync/meson.build | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/meson.build b/lib/meson.build index be5af33ef..0eb47570e 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -87,7 +87,8 @@ libephymisc = shared_library('ephymisc', dependencies: libephymisc_deps, include_directories: libephymisc_includes, install: true, - install_dir: pkglibdir + install_dir: pkglibdir, + install_rpath: pkglibdir ) ephymisc_dep = declare_dependency( diff --git a/lib/sync/meson.build b/lib/sync/meson.build index 5a5b066e8..73a0bfa1d 100644 --- a/lib/sync/meson.build +++ b/lib/sync/meson.build @@ -39,7 +39,8 @@ libephysync = shared_library('ephysync', dependencies: libephysync_deps, include_directories: libephysync_includes, install: true, - install_dir: pkglibdir + install_dir: pkglibdir, + install_rpath: pkglibdir ) ephysync_dep = declare_dependency( |