diff options
author | Roy Li <rongqing.li@windriver.com> | 2016-04-26 13:13:01 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-06 10:31:15 +0100 |
commit | 0c26298c0c3917c164972fad0384304803c3e8bf (patch) | |
tree | 1b34b6cb8cae0e7e5fa1ef813866abfdf0ee58a0 /meta/recipes-support/curl/curl/0001-replace-krb5-config-with-pkg-config.patch | |
parent | 9efd5474ff761a6cc2450a556ffc24e1951fa96d (diff) | |
download | poky-0c26298c0c3917c164972fad0384304803c3e8bf.tar.gz |
curl: add krb5 to PACKAGECONFIG
krb5 is needed to enables GSS-Negotiate authentication
(From OE-Core rev: 78811b6e608452a3137df6ed2346c69d42d8fd27)
Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/curl/curl/0001-replace-krb5-config-with-pkg-config.patch')
-rw-r--r-- | meta/recipes-support/curl/curl/0001-replace-krb5-config-with-pkg-config.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/meta/recipes-support/curl/curl/0001-replace-krb5-config-with-pkg-config.patch b/meta/recipes-support/curl/curl/0001-replace-krb5-config-with-pkg-config.patch new file mode 100644 index 0000000000..74e5d99cf2 --- /dev/null +++ b/meta/recipes-support/curl/curl/0001-replace-krb5-config-with-pkg-config.patch | |||
@@ -0,0 +1,43 @@ | |||
1 | [PATCH] replace krb5-config with pkg-config | ||
2 | |||
3 | Upstream-Status: Pending | ||
4 | |||
5 | Signed-off-by: Roy Li <rongqing.li@windriver.com> | ||
6 | --- | ||
7 | configure.ac | 6 +++--- | ||
8 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
9 | |||
10 | diff --git a/configure.ac b/configure.ac | ||
11 | index e99b303..dc93f39 100644 | ||
12 | --- a/configure.ac | ||
13 | +++ b/configure.ac | ||
14 | @@ -1196,7 +1196,7 @@ AC_ARG_WITH(gssapi, | ||
15 | fi | ||
16 | ]) | ||
17 | |||
18 | -: ${KRB5CONFIG:="$GSSAPI_ROOT/bin/krb5-config"} | ||
19 | +KRB5CONFIG=`which pkg-config` | ||
20 | |||
21 | save_CPPFLAGS="$CPPFLAGS" | ||
22 | AC_MSG_CHECKING([if GSS-API support is requested]) | ||
23 | @@ -1207,7 +1207,7 @@ if test x"$want_gss" = xyes; then | ||
24 | if test -n "$host_alias" -a -f "$GSSAPI_ROOT/bin/$host_alias-krb5-config"; then | ||
25 | GSSAPI_INCS=`$GSSAPI_ROOT/bin/$host_alias-krb5-config --cflags gssapi` | ||
26 | elif test -f "$KRB5CONFIG"; then | ||
27 | - GSSAPI_INCS=`$KRB5CONFIG --cflags gssapi` | ||
28 | + GSSAPI_INCS=`$KRB5CONFIG --cflags mit-krb5-gssapi` | ||
29 | elif test "$GSSAPI_ROOT" != "yes"; then | ||
30 | GSSAPI_INCS="-I$GSSAPI_ROOT/include" | ||
31 | fi | ||
32 | @@ -1300,7 +1300,7 @@ if test x"$want_gss" = xyes; then | ||
33 | elif test -f "$KRB5CONFIG"; then | ||
34 | dnl krb5-config doesn't have --libs-only-L or similar, put everything | ||
35 | dnl into LIBS | ||
36 | - gss_libs=`$KRB5CONFIG --libs gssapi` | ||
37 | + gss_libs=`$KRB5CONFIG --libs mit-krb5-gssapi` | ||
38 | LIBS="$gss_libs $LIBS" | ||
39 | else | ||
40 | case $host in | ||
41 | -- | ||
42 | 1.9.1 | ||
43 | |||