← Back to branch summary

~ubuntu-branches/ubuntu/trusty/krb5/trusty-proposed

« back to all changes in this revision

Viewing changes to debian/patches/debian-local/0007-debian-suppress-usr-lib-in-krb5-config.patch

  • Committer: Package Import Robot
  • Author(s): Dmitrijs Ledkovs
  • Date: 2013-11-10 02:20:12 UTC
  • mfrom: (53.1.3 trusty-proposed)
  • Revision ID: package-import@ubuntu.com-20131110022012-b8ojkqhcxos55kln
Add alternate dependency on libverto-libevent1 as that's the package
ABI name in ubuntu.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/debian-local/0007-debian-suppress-usr-lib-in-krb5-config.patch
1
 
From 44a933305d07b1932c5befe8dabb4daa12d335b4 Mon Sep 17 00:00:00 2001
2
 
From: Sam Hartman <hartmans@debian.org>
3
 
Date: Mon, 26 Dec 2011 18:19:53 -0500
4
 
Subject: debian: suppress /usr/lib in krb5-config
5
 
 
6
 
Handel multi-arch suppressions
7
 
 
8
 
Patch-Category: debian-local
9
 
---
10
 
 src/krb5-config.in | 14 +++++++++-----
11
 
 1 file changed, 9 insertions(+), 5 deletions(-)
12
 
 
13
 
diff --git a/src/krb5-config.in b/src/krb5-config.in
14
 
index b476b4f..cad5afc 100755
15
 
--- a/src/krb5-config.in
16
 
+++ b/src/krb5-config.in
17
 
@@ -117,6 +117,7 @@ if test -n "$do_help"; then
18
 
     echo "        [--prefix]        Kerberos installed prefix"
19
 
     echo "        [--exec-prefix]   Kerberos installed exec_prefix"
20
 
     echo "        [--cflags]        Compile time CFLAGS"
21
 
+    echo "        [--deps]          Include dependent libraries"
22
 
     echo "        [--libs]          List libraries required to link [LIBRARIES]"
23
 
     echo "Libraries:"
24
 
     echo "        krb5              Kerberos 5 application"
25
 
@@ -172,11 +173,14 @@ fi
26
 
 
27
 
 if test -n "$do_libs"; then
28
 
     # Assumes /usr/lib is the standard library directory everywhere...
29
 
-    if test "$libdir" = /usr/lib; then
30
 
-       libdirarg=
31
 
-    else
32
 
-       libdirarg="-L$libdir"
33
 
-    fi
34
 
+    case $libdir in
35
 
+       /usr/lib*)
36
 
+           libdirarg=
37
 
+           ;;
38
 
+       *)
39
 
+           libdirarg="-L$libdir"
40
 
+           ;;
41
 
+    esac
42
 
     # Ugly gross hack for our build tree
43
 
     lib_flags=`echo $CC_LINK | sed -e 's/\$(CC)//' \
44
 
            -e 's/\$(PURE)//' \