[Pkg-voip-commits] [belle-sip] 06/09: Instead of patching CMakeLists.txt to remove rpath, pass CMAKE_SKIP_RPATH=ON

[Johannes Schauer]

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

josch-guest pushed a commit to branch master
in repository belle-sip.

commit 1b86f59bb93ff453fde492b354ad59705a937114
Author: Johannes 'josch' Schauer <josch at mister-muffin.de>
Date:   Mon Apr 24 18:21:08 2017 +0200

    Instead of patching CMakeLists.txt to remove rpath, pass CMAKE_SKIP_RPATH=ON
---
 debian/changelog                |  1 +
 debian/patches/kill-rpath.patch | 16 ----------------
 debian/patches/series           |  1 -
 debian/rules                    |  5 +++++
 4 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bea5cfa..70f2824 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,7 @@ belle-sip (1.6.1-1) UNRELEASED; urgency=medium
   * debian/rules: no need to add duplicate rule for "build"
   * bump debhelper compatibility level to 10
   * debian/rules: Use hardening=+all
+  * use CMAKE_SKIP_RPATH=ON to avoid rpath in libraries
 
  -- Tzafrir Cohen <tzafrir at debian.org>  Sat, 23 May 2015 16:30:12 +0300
 
diff --git a/debian/patches/kill-rpath.patch b/debian/patches/kill-rpath.patch
deleted file mode 100644
index 78464d8..0000000
--- a/debian/patches/kill-rpath.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Subject: Stop setting RPATH in binaries
-Author: Daniel Gnoutcheff <daniel at gnoutcheff.name>
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -64,11 +64,6 @@ include(CheckCSourceCompiles)
- include(CMakePushCheckState)
- include(GNUInstallDirs)
- 
--if(NOT CMAKE_INSTALL_RPATH AND CMAKE_INSTALL_PREFIX)
--	set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR})
--	message(STATUS "Setting install rpath to ${CMAKE_INSTALL_RPATH}")
--endif()
--
- set(MSVC_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include/MSVC")
- if(MSVC)
- 	list(APPEND CMAKE_REQUIRED_INCLUDES ${MSVC_INCLUDE_DIR})
diff --git a/debian/patches/series b/debian/patches/series
index 69c165d..4f68439 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 fix-spelling-errors.patch
-kill-rpath.patch
 cmake-zlib.patch
diff --git a/debian/rules b/debian/rules
index 30a9cf0..f50f354 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,5 +12,10 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 # As of 1.5.0, upstream tree has a 'build' directory.
 .PHONY: build
 
+# Upstream unconditionally sets CMAKE_INSTALL_RPATH. Make it ineffective by
+# setting CMAKE_SKIP_RPATH
+override_dh_auto_configure:
+	dh_auto_configure -- -DCMAKE_SKIP_RPATH=ON
+
 override_dh_strip:
 	dh_strip --dbg-package=libbellesip-dbg

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/belle-sip.git