[tracker/wip/sam/meson] meson: Set rpaths in the executables
- From: Sam Thursfield <sthursfield src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker/wip/sam/meson] meson: Set rpaths in the executables
- Date: Sun, 12 Mar 2017 00:08:25 +0000 (UTC)
commit aef0b02fe89d3552cc9d55db9be169eecff96db2
Author: Sam Thursfield <sam afuera me uk>
Date: Sun Mar 12 00:07:35 2017 +0000
meson: Set rpaths in the executables
Otherwise internal libs aren't found
src/miners/apps/meson.build | 3 ++-
src/miners/fs/meson.build | 3 ++-
src/miners/rss/meson.build | 5 ++---
src/miners/user-guides/meson.build | 3 ++-
src/tracker-preferences/meson.build | 3 ++-
src/tracker-store/meson.build | 3 ++-
src/tracker/meson.build | 1 +
7 files changed, 13 insertions(+), 8 deletions(-)
---
diff --git a/src/miners/apps/meson.build b/src/miners/apps/meson.build
index 18a6fdb..da4055b 100644
--- a/src/miners/apps/meson.build
+++ b/src/miners/apps/meson.build
@@ -7,7 +7,8 @@ executable('tracker-miner-apps', sources,
dependencies: [tracker_common_dep, tracker_miner_dep],
c_args: [ '-DTRACKER_COMPILATION', ],
install: true,
- install_dir: get_option('libexecdir')
+ install_dir: get_option('libexecdir'),
+ install_rpath: tracker_internal_libs_dir,
)
dbus_service_file_untranslated = configure_file(
diff --git a/src/miners/fs/meson.build b/src/miners/fs/meson.build
index 010388e..c886ad6 100644
--- a/src/miners/fs/meson.build
+++ b/src/miners/fs/meson.build
@@ -23,7 +23,8 @@ executable('tracker-miner-fs', sources,
'-DTRACKER_COMPILATION',
],
install: true,
- install_dir: get_option('libexecdir')
+ install_dir: get_option('libexecdir'),
+ install_rpath: tracker_internal_libs_dir,
)
install_data(
diff --git a/src/miners/rss/meson.build b/src/miners/rss/meson.build
index e4406ab..536e1d8 100644
--- a/src/miners/rss/meson.build
+++ b/src/miners/rss/meson.build
@@ -5,9 +5,8 @@ sources = [
executable('tracker-miner-rss', sources,
dependencies: [libgrss, tracker_common_dep, tracker_miner_dep, tracker_extract_dep],
- c_args: [
- '-DTRACKER_COMPILATION',
- ],
+ c_args: [ '-DTRACKER_COMPILATION', ],
+ install_rpath: tracker_internal_libs_dir,
)
dbus_service_file_untranslated = configure_file(
diff --git a/src/miners/user-guides/meson.build b/src/miners/user-guides/meson.build
index 9649cf1..1d565e4 100644
--- a/src/miners/user-guides/meson.build
+++ b/src/miners/user-guides/meson.build
@@ -7,7 +7,8 @@ executable('tracker-miner-user-guides', sources,
dependencies: [libxml2, tracker_common_dep, tracker_miner_dep],
c_args: [ '-DTRACKER_COMPILATION', ],
install: true,
- install_dir: get_option('libexecdir')
+ install_dir: get_option('libexecdir'),
+ install_rpath: tracker_internal_libs_dir,
)
dbus_service_file_untranslated = configure_file(
diff --git a/src/tracker-preferences/meson.build b/src/tracker-preferences/meson.build
index 902085d..9ebe902 100644
--- a/src/tracker-preferences/meson.build
+++ b/src/tracker-preferences/meson.build
@@ -13,7 +13,8 @@ executable(
vala_args: [
'--pkg', 'posix'
],
- install: true
+ install: true,
+ install_rpath: tracker_internal_libs_dir
)
desktop_file_untranslated = configure_file(
diff --git a/src/tracker-store/meson.build b/src/tracker-store/meson.build
index b941e9e..6b1b540 100644
--- a/src/tracker-store/meson.build
+++ b/src/tracker-store/meson.build
@@ -30,7 +30,8 @@ executable('tracker-store',
gio_unix
],
install: true,
- install_dir: join_paths(get_option('prefix'), get_option('libexecdir')))
+ install_dir: join_paths(get_option('prefix'), get_option('libexecdir')),
+ install_rpath: tracker_internal_libs_dir)
install_data(
'tracker-backup.xml',
diff --git a/src/tracker/meson.build b/src/tracker/meson.build
index a71af94..68ab52e 100644
--- a/src/tracker/meson.build
+++ b/src/tracker/meson.build
@@ -24,6 +24,7 @@ executable('tracker', sources,
'-DTRACKER_COMPILATION',
],
install: true,
+ install_rpath: tracker_internal_libs_dir,
# This doesn't depend on tracker_common_dep because of
# https://github.com/mesonbuild/meson/issues/671
dependencies: [tracker_control_dep, tracker_sparql_dep, tracker_data_dep],
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]