summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2009-08-01 15:59:03 -0400
committerJoey Hess <joey@gnu.kitenet.net>2009-08-01 15:59:03 -0400
commit88a4a89d45a62550c6f9d0a68cc84d590c28c654 (patch)
treef422bcf97c654b1d7fcb64136beab9d78cf5724a
parent40ecc9e16d5de238ae3ddc402c2465756491fe53 (diff)
cmake: Avoid forcing rpath off as this can break some test suites. It gets stripped by cmake at install time. Closes: #538977
-rw-r--r--Debian/Debhelper/Buildsystem/cmake.pm1
-rw-r--r--debian/changelog7
2 files changed, 7 insertions, 1 deletions
diff --git a/Debian/Debhelper/Buildsystem/cmake.pm b/Debian/Debhelper/Buildsystem/cmake.pm
index 2c52e49..21a077e 100644
--- a/Debian/Debhelper/Buildsystem/cmake.pm
+++ b/Debian/Debhelper/Buildsystem/cmake.pm
@@ -34,7 +34,6 @@ sub configure {
# Standard set of cmake flags
push @flags, "-DCMAKE_INSTALL_PREFIX=/usr";
- push @flags, "-DCMAKE_SKIP_RPATH=ON";
push @flags, "-DCMAKE_VERBOSE_MAKEFILE=ON";
$this->mkdir_builddir();
diff --git a/debian/changelog b/debian/changelog
index be712d2..7de6734 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debhelper (7.3.9) UNRELEASED; urgency=low
+
+ * cmake: Avoid forcing rpath off as this can break some test suites.
+ It gets stripped by cmake at install time. Closes: #538977
+
+ -- Joey Hess <joeyh@debian.org> Sat, 01 Aug 2009 15:49:54 -0400
+
debhelper (7.3.8) unstable; urgency=low
* Fix t/override_target to use ./run. Closes: #538315