1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
|
From: Brian May <bam@debian.org>
Date: Wed, 26 Apr 2017 06:29:24 +1000
Subject: Disable use of rpath in krb5-config.heimdal
See https://bugs.debian.org/868840
This also solves another issue:
Disable use of @CANONICAL_HOST@, which is not reproducible.
https://github.com/heimdal/heimdal/issues/237
---
tools/krb5-config.in | 39 ---------------------------------------
1 file changed, 39 deletions(-)
diff --git a/tools/krb5-config.in b/tools/krb5-config.in
index 743c9eb..bf082bc 100644
--- a/tools/krb5-config.in
+++ b/tools/krb5-config.in
@@ -171,42 +171,6 @@ if test "$print_exec_prefix" = "yes"; then
exit 0
fi
-# The following rpath_flag setting code is distilled from MIT Kerberos'
-# src/config/shlib.conf. Some of this seems ancient and likely to be
-# wrong in some cases, but right for all the cases we probably care
-# about. Also, this will very likely be wrong depending on how the
-# caller will be doing link-edits (with what compiler-driver or
-# link-editor)! There's no fixing this.
-#
-# In principle this doesn't belong here: application should instead use
-# krb5-config --libdir to get the directory to use for the rpath, then
-# workout the rpath flags on their own. Of course, there's no --libdir
-# option... And MIT's krb5-config does include rpath flags.
-#
-# Compatibility with MIT is the winning consideration for now.
-EOM
-
-case "@CANONICAL_HOST@" in
-alpha*-dec-osf*)
- rpath_flag='-Wl,-rpath -Wl,';;
-*-*-hpux*)
- rpath_flag='-Wl,+b,';;
-*-*-irix* | mips-*-netbsd*)
- rpath_flag='-Wl,-rpath -Wl,';;
-*-*-netbsd* | *-*-openbsd* | *-*-solaris*)
- rpath_flag='-R';;
-*-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu | *-*-freebsd*)
- rpath_flag='-Wl,--enable-new-dtags -Wl,-rpath -Wl,';;
-*-*-aix*)
- rpath_flag='-Wl,-blibpath:';;
-*)
-rpath_flag=;;
-esac
-
-echo "rpath_flag='$rpath_flag'"
-
-cat <<'EOM'
-
if test "$do_libs" = "yes"; then
deplibs=""
if test "$lib_gssapi" = yes; then
@@ -247,9 +211,6 @@ if test "$do_libs" = "yes"; then
fi
if test X"$libdir" != X/usr/lib; then
lib_flags="-L${libdir} $lib_flags"
- if test X"$rpath_flag" != X; then
- lib_flags="${rpath_flag}${libdir} $lib_flags"
- fi
fi
echo ${lib_flags}
|
