summaryrefslogtreecommitdiffstats
path: root/import-layers/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5/debian-suppress-usr-lib-in-krb5-config.patch
blob: f0182ee5dbfc637c267c56ea7c0e07fd05542272 (plain)
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
Subject: [PATCH] debian: suppress /usr/lib in krb5-config

Upstream-Status: Pending

Handel multi-arch suppressions

The patch is from debian.

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
 src/build-tools/krb5-config.in |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/build-tools/krb5-config.in b/src/build-tools/krb5-config.in
index f6184da..637bad7 100755
--- a/src/build-tools/krb5-config.in
+++ b/src/build-tools/krb5-config.in
@@ -138,6 +138,7 @@ if test -n "$do_help"; then
     echo "        [--defktname]     Show built-in default keytab name"
     echo "        [--defcktname]    Show built-in default client keytab name"
     echo "        [--cflags]        Compile time CFLAGS"
+    echo "        [--deps]          Include dependent libraries"
     echo "        [--libs]          List libraries required to link [LIBRARIES]"
     echo "Libraries:"
     echo "        krb5              Kerberos 5 application"
@@ -209,11 +210,14 @@ fi
 
 if test -n "$do_libs"; then
     # Assumes /usr/lib is the standard library directory everywhere...
-    if test "$libdir" = /usr/lib; then
-	libdirarg=
-    else
-	libdirarg="-L$libdir"
-    fi
+    case $libdir in
+	/usr/lib*)
+	    libdirarg=
+	    ;;
+	*)
+	    libdirarg="-L$libdir"
+	    ;;
+    esac
     # Ugly gross hack for our build tree
     lib_flags=`echo $CC_LINK | sed -e 's/\$(CC)//' \
 	    -e 's/\$(PURE)//' \
-- 
1.7.1

OpenPOWER on IntegriCloud