[Pkg-voip-commits] [ortp] 04/10: 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 ortp.

commit ebfae8d8a29c47a81402f6103655faa904ab36b1
Author: Johannes 'josch' Schauer <josch at mister-muffin.de>
Date:   Mon Apr 24 14:53:14 2017 +0200

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

diff --git a/debian/patches/kill-rpath.patch b/debian/patches/kill-rpath.patch
deleted file mode 100644
index c9d7cd1..0000000
--- a/debian/patches/kill-rpath.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Author: Daniel Gnoutcheff <daniel at gnoutcheff.name>
-Subject: Disable RPATH
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -62,11 +62,6 @@
- include(CheckFunctionExists)
- 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
deleted file mode 100644
index 33ed55d..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-kill-rpath.patch
diff --git a/debian/rules b/debian/rules
index c8ef1d9..4865289 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,3 +13,8 @@
 # As of 0.27.0, upstream has a 'build' directory.
 # Don't let that confuse us.
 .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

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