[Pkg-voip-commits] [bctoolbox] 09/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 pushed a commit to branch debian/sid
in repository bctoolbox.

commit 63aeb809bfc46bb3c35c111a51d7b27de2c04276
Author: Johannes 'josch' Schauer <josch at mister-muffin.de>
Date:   Mon Apr 24 09:04:00 2017 +0200

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

diff --git a/debian/patches/kill-rpath.patch b/debian/patches/kill-rpath.patch
deleted file mode 100644
index b17960b..0000000
--- a/debian/patches/kill-rpath.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Upstream wants to use RPATH unconditionally for reasons.  Kill it with fire.
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -74,11 +74,6 @@
- 
- list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
- 
--if(NOT CPACK_GENERATOR AND 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()
--
- if(ENABLE_MBEDTLS)
- 	find_package(MbedTLS)
- 	if(MBEDTLS_FOUND)
diff --git a/debian/patches/series b/debian/patches/series
index bba0ced..1c4000c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-kill-rpath.patch
 deprecated_mbedtls_header
diff --git a/debian/rules b/debian/rules
index f9124e3..b85095f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,5 +14,8 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 # As of version 0.4.0, upstream recommends CMake for configuration.
 # Requires CUnit 3.x by default, which is not available in Debian as of Dec
 # 2016.  Disable tests for now to avoid build configure failures.
+#
+# Upstream unconditionally sets CMAKE_INSTALL_RPATH. Make it ineffective by
+# setting CMAKE_SKIP_RPATH
 override_dh_auto_configure:
-	dh_auto_configure -- -DENABLE_TESTS_COMPONENT=OFF
+	dh_auto_configure -- -DCMAKE_SKIP_RPATH=ON -DENABLE_TESTS_COMPONENT=OFF

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