[libheimdal-kadm5-perl] 24/27: Strip out the -rpath setting from krb5-config

[Russ Allbery]

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

rra pushed a commit to branch master
in repository libheimdal-kadm5-perl.

commit a49609592da6e64db3173c1ff7a42f87bb3d481d
Author: Russ Allbery <eagle at eyrie.org>
Date:   Mon Dec 18 04:31:29 2017

    Strip out the -rpath setting from krb5-config
    
    * Strip out the -rpath setting from the Heimdal krb5-config --libs call.
      This isn't necessary; the libraries are installed in the normal
      library search path.  Only -L is needed (because of heimdal-multidev).
---
 debian/changelog                     |  3 +++
 debian/patches/fix-ld-run-path.patch | 16 ++++++++++++++++
 debian/patches/series                |  1 +
 3 files changed, 20 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 1b1603f..b2026d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ libheimdal-kadm5-perl (0.08-5) UNRELEASED; urgency=medium
   * Build with current Heimdal.  (Closes: #837628)
   * Guard against a NULL mod_name in getModName and return undef.  Thanks,
     Sergio Gelato.  (Closes: #670517)
+  * Strip out the -rpath setting from the Heimdal krb5-config --libs call.
+    This isn't necessary; the libraries are installed in the normal
+    library search path.  Only -L is needed (because of heimdal-multidev).
   * Enable bindnow hardening flags.
   * Fix spelling error in manual page caught by Lintian.
   * Convert to a proper 3.0 (quilt) package with managed patches.
diff --git a/debian/patches/fix-ld-run-path.patch b/debian/patches/fix-ld-run-path.patch
new file mode 100644
index 0000000..3afee18
--- /dev/null
+++ b/debian/patches/fix-ld-run-path.patch
@@ -0,0 +1,16 @@
+Description: Strip out code from Debian krb5-config to set -rpath
+Author: Russ Allbery <rra at debian.org>
+
+--- heimdal-kadm5.orig/Makefile.PL
++++ heimdal-kadm5/Makefile.PL
+@@ -16,6 +16,10 @@
+     chomp $cflags;
+ }
+ 
++# On Debian, krb5-config returns code to set an -rpath to the Heimdal library
++# directory, but we don't want to encode that in the module.  Strip this out.
++$lflags =~ s{-Wl,-rpath -Wl,\S+ }{};
++
+ printf "cflags: $cflags\n";
+ printf "lflags: $lflags\n";
+ 
diff --git a/debian/patches/series b/debian/patches/series
index ddc0661..992e96d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 fix-library-calls.patch
 guard-against-null-mod-name.patch
 man-page-spelling.patch
+fix-ld-run-path.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libheimdal-kadm5-perl.git