[debhelper-devel] [debhelper] 12/12: cmake: Force usage of RPATH for the eos-app build profile

[Niels Thykier]

This is an automated email from the git hooks/post-receive script.

nthykier pushed a commit to annotated tag Release_2.3.0
in repository debhelper.

commit 52631c12c6c17f2242e7744b1d63bceccd411e36
Author: Dan Nicholson <nicholson at endlessm.com>
Date:   Mon Sep 8 12:16:49 2014 -0700

    cmake: Force usage of RPATH for the eos-app build profile
    
    The default debian configuration of cmake tries hard not to use RPATH,
    but we require it for apps installed in /usr to work without additional
    dynamic linker runtime configuration.
    
    [endlessm/eos-shell#3608]
---
 Debian/Debhelper/Buildsystem/cmake.pm | 3 +++
 debian/changelog                      | 8 ++++++++
 2 files changed, 11 insertions(+)

diff --git a/Debian/Debhelper/Buildsystem/cmake.pm b/Debian/Debhelper/Buildsystem/cmake.pm
index 1c44825..ea6210c 100644
--- a/Debian/Debhelper/Buildsystem/cmake.pm
+++ b/Debian/Debhelper/Buildsystem/cmake.pm
@@ -45,6 +45,9 @@ sub configure {
 		# Get package app id for prefix
 		my $app_prefix = package_eos_app_id();
 		push @flags, "-DCMAKE_INSTALL_PREFIX=/endless/" . $app_prefix;
+
+		# Always include the RPATH from the app link paths.
+		push @flags, "-DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=ON";
 	}
 	else {
 		push @flags, "-DCMAKE_INSTALL_PREFIX=/usr";
diff --git a/debian/changelog b/debian/changelog
index dc6f78f..4e79549 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+debhelper (9.20130630co2endless10) eos; urgency=low
+
+  * Debian/Debhelper/Buildsystem/cmake.pm:
+    - Force usage of RPATH for the eos-app build profile.
+  [endlessm/eos-shell#3608]
+
+ -- Dan Nicholson <nicholson at endlessm.com>  Mon, 08 Sep 2014 12:16:49 -0700
+
 debhelper (9.20130630co2endless9) eos; urgency=low
 
   [ Andreas Beckmann ]

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debhelper/debhelper.git