diff options
| author | Joey Hess <joey@kitenet.net> | 2009-08-01 16:13:47 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2009-08-01 16:13:47 -0400 |
| commit | 53f442c638cf3c8a7e40a25f72c21c342640454e (patch) | |
| tree | 9e4341b612fbf1c3bf4d97849791e032cd40a88a | |
| parent | 8e6f42e9a8bacc27580692c3102e8ed83d911316 (diff) | |
| parent | b959c36c0a29272de3199b0c87d1058abd71eadb (diff) | |
Merge branch 'master' of ssh://git.debian.org/git/debhelper/debhelper
| -rw-r--r-- | Debian/Debhelper/Buildsystem/cmake.pm | 1 | ||||
| -rw-r--r-- | debian/changelog | 7 |
2 files changed, 7 insertions, 1 deletions
diff --git a/Debian/Debhelper/Buildsystem/cmake.pm b/Debian/Debhelper/Buildsystem/cmake.pm index 2c52e494..21a077ec 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 be712d28..20667098 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +debhelper (7.3.9) unstable; 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:59:07 -0400 + debhelper (7.3.8) unstable; urgency=low * Fix t/override_target to use ./run. Closes: #538315 |