[gnome-builder] build: use rpath when linking libgd
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder] build: use rpath when linking libgd
- Date: Sun, 13 Aug 2017 20:16:45 +0000 (UTC)
commit 3c91db017c6fc68086194877ab2ce80103c7e934
Author: Marinus Schraal <mschraal gnome org>
Date: Sun Aug 13 17:29:47 2017 +0200
build: use rpath when linking libgd
Add the builder libdir as rpath to the plugins and libide using the
internal libgd. Preventing a clash with the system-wide library with the
same name.
https://bugzilla.gnome.org/show_bug.cgi?id=786251
libide/meson.build | 1 +
plugins/command-bar/meson.build | 1 +
plugins/devhelp/meson.build | 1 +
plugins/terminal/meson.build | 1 +
4 files changed, 4 insertions(+), 0 deletions(-)
---
diff --git a/libide/meson.build b/libide/meson.build
index e5e06e0..bb0f03f 100644
--- a/libide/meson.build
+++ b/libide/meson.build
@@ -653,6 +653,7 @@ libide = shared_library('ide-' + libide_api_version,
link_args: [ '-Wl,--version-script,' + join_paths(meson.current_source_dir(), 'ide.map') ],
install: true,
install_dir: pkglibdir,
+ install_rpath: pkglibdir_abs,
)
libide_dep = declare_dependency(
diff --git a/plugins/command-bar/meson.build b/plugins/command-bar/meson.build
index f708e8d..8431194 100644
--- a/plugins/command-bar/meson.build
+++ b/plugins/command-bar/meson.build
@@ -41,6 +41,7 @@ shared_module('command-bar', command_bar_sources,
link_depends: plugin_link_deps,
install: true,
install_dir: plugindir,
+ install_rpath: pkglibdir_abs,
)
configure_file(
diff --git a/plugins/devhelp/meson.build b/plugins/devhelp/meson.build
index 286234e..98bcd08 100644
--- a/plugins/devhelp/meson.build
+++ b/plugins/devhelp/meson.build
@@ -35,6 +35,7 @@ shared_module('devhelp-plugin', devhelp_sources,
link_depends: plugin_link_deps,
install: true,
install_dir: plugindir,
+ install_rpath: pkglibdir_abs,
)
configure_file(
diff --git a/plugins/terminal/meson.build b/plugins/terminal/meson.build
index a59dc7b..699bc5d 100644
--- a/plugins/terminal/meson.build
+++ b/plugins/terminal/meson.build
@@ -39,6 +39,7 @@ shared_module('terminal', terminal_sources,
link_depends: plugin_link_deps,
install: true,
install_dir: plugindir,
+ install_rpath: pkglibdir_abs,
)
configure_file(
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]