[tracker/wip/carlosg/redundant-rpath] build: Avoid setting the regular library path in rpath
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker/wip/carlosg/redundant-rpath] build: Avoid setting the regular library path in rpath
- Date: Tue, 8 Jun 2021 09:21:43 +0000 (UTC)
commit d0ef77b8837ad067a43b11d4994ab63b5dbe0bc4
Author: Carlos Garnacho <carlosg gnome org>
Date: Tue Jun 8 11:13:04 2021 +0200
build: Avoid setting the regular library path in rpath
This is redundant, and Fedora has made it a requirement to drop
unnecessary rpaths.
meson.build | 1 -
src/portal/meson.build | 1 -
src/tracker/meson.build | 2 +-
3 files changed, 1 insertion(+), 3 deletions(-)
---
diff --git a/meson.build b/meson.build
index b786643c4..b142b1835 100644
--- a/meson.build
+++ b/meson.build
@@ -321,7 +321,6 @@ build_root = meson.current_build_dir()
po_subdir = join_paths(source_root, 'po')
tracker_internal_libs_dir = join_paths(get_option('prefix'), get_option('libdir'), 'tracker-' +
tracker_api_version)
-tracker_install_rpath = ':'.join([tracker_internal_libs_dir, libdir])
# NOTE: We don't use ${TRACKER_API_VERSION} because other content like
# the ontology is installed to the same location.
diff --git a/src/portal/meson.build b/src/portal/meson.build
index b4bb7feb9..c39f6b3da 100644
--- a/src/portal/meson.build
+++ b/src/portal/meson.build
@@ -8,7 +8,6 @@ sources = [
executable('tracker-xdg-portal-@0@'.format(tracker_api_major), sources,
c_args: tracker_c_args,
install: true,
- install_rpath: tracker_install_rpath,
install_dir: get_option('libexecdir'),
dependencies: [tracker_sparql_dep, tracker_common_dep],
include_directories: [commoninc, configinc, srcinc],
diff --git a/src/tracker/meson.build b/src/tracker/meson.build
index 882945a42..1cb0a4932 100644
--- a/src/tracker/meson.build
+++ b/src/tracker/meson.build
@@ -26,7 +26,7 @@ executable(command_name, sources,
'-DBINDIR="@0@"'.format(join_paths(get_option('prefix'), get_option('bindir'))),
],
install: true,
- install_rpath: tracker_install_rpath,
+ install_rpath: tracker_internal_libs_dir,
dependencies: [tracker_sparql_dep, tracker_data_dep],
include_directories: [commoninc, configinc, srcinc],
)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]