diff options
Diffstat (limited to 'meta-oe/recipes-connectivity/krb5/krb5/debian-suppress-usr-lib-in-krb5-config.patch')
-rw-r--r-- | meta-oe/recipes-connectivity/krb5/krb5/debian-suppress-usr-lib-in-krb5-config.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/meta-oe/recipes-connectivity/krb5/krb5/debian-suppress-usr-lib-in-krb5-config.patch b/meta-oe/recipes-connectivity/krb5/krb5/debian-suppress-usr-lib-in-krb5-config.patch new file mode 100644 index 000000000..f0182ee5d --- /dev/null +++ b/meta-oe/recipes-connectivity/krb5/krb5/debian-suppress-usr-lib-in-krb5-config.patch | |||
@@ -0,0 +1,48 @@ | |||
1 | Subject: [PATCH] debian: suppress /usr/lib in krb5-config | ||
2 | |||
3 | Upstream-Status: Pending | ||
4 | |||
5 | Handel multi-arch suppressions | ||
6 | |||
7 | The patch is from debian. | ||
8 | |||
9 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> | ||
10 | --- | ||
11 | src/build-tools/krb5-config.in | 14 +++++++++----- | ||
12 | 1 files changed, 9 insertions(+), 5 deletions(-) | ||
13 | |||
14 | diff --git a/src/build-tools/krb5-config.in b/src/build-tools/krb5-config.in | ||
15 | index f6184da..637bad7 100755 | ||
16 | --- a/src/build-tools/krb5-config.in | ||
17 | +++ b/src/build-tools/krb5-config.in | ||
18 | @@ -138,6 +138,7 @@ if test -n "$do_help"; then | ||
19 | echo " [--defktname] Show built-in default keytab name" | ||
20 | echo " [--defcktname] Show built-in default client keytab name" | ||
21 | echo " [--cflags] Compile time CFLAGS" | ||
22 | + echo " [--deps] Include dependent libraries" | ||
23 | echo " [--libs] List libraries required to link [LIBRARIES]" | ||
24 | echo "Libraries:" | ||
25 | echo " krb5 Kerberos 5 application" | ||
26 | @@ -209,11 +210,14 @@ fi | ||
27 | |||
28 | if test -n "$do_libs"; then | ||
29 | # Assumes /usr/lib is the standard library directory everywhere... | ||
30 | - if test "$libdir" = /usr/lib; then | ||
31 | - libdirarg= | ||
32 | - else | ||
33 | - libdirarg="-L$libdir" | ||
34 | - fi | ||
35 | + case $libdir in | ||
36 | + /usr/lib*) | ||
37 | + libdirarg= | ||
38 | + ;; | ||
39 | + *) | ||
40 | + libdirarg="-L$libdir" | ||
41 | + ;; | ||
42 | + esac | ||
43 | # Ugly gross hack for our build tree | ||
44 | lib_flags=`echo $CC_LINK | sed -e 's/\$(CC)//' \ | ||
45 | -e 's/\$(PURE)//' \ | ||
46 | -- | ||
47 | 1.7.1 | ||
48 | |||