mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-05 07:39:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

curl: add krb5 to PACKAGECONFIG

Browse Source 
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>
This commit is contained in:
Roy Li
2016-04-26 13:13:01 +08:00
committed by Richard Purdie
parent 9efd5474ff
commit 0c26298c0c
2 changed files with 47 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
meta/recipes-support/curl/curl/0001-replace-krb5-config-with-pkg-config.patch Normal file
View File

@@ -0,0 +1,43 @@
[PATCH] replace krb5-config with pkg-config
Upstream-Status: Pending
Signed-off-by: Roy Li <rongqing.li@windriver.com>
---
configure.ac | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac
index e99b303..dc93f39 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1196,7 +1196,7 @@ AC_ARG_WITH(gssapi,
fi
])
-: ${KRB5CONFIG:="$GSSAPI_ROOT/bin/krb5-config"}
+KRB5CONFIG=`which pkg-config`
save_CPPFLAGS="$CPPFLAGS"
AC_MSG_CHECKING([if GSS-API support is requested])
@@ -1207,7 +1207,7 @@ if test x"$want_gss" = xyes; then
if test -n "$host_alias" -a -f "$GSSAPI_ROOT/bin/$host_alias-krb5-config"; then
GSSAPI_INCS=`$GSSAPI_ROOT/bin/$host_alias-krb5-config --cflags gssapi`
elif test -f "$KRB5CONFIG"; then
- GSSAPI_INCS=`$KRB5CONFIG --cflags gssapi`
+ GSSAPI_INCS=`$KRB5CONFIG --cflags mit-krb5-gssapi`
elif test "$GSSAPI_ROOT" != "yes"; then
GSSAPI_INCS="-I$GSSAPI_ROOT/include"
fi
@@ -1300,7 +1300,7 @@ if test x"$want_gss" = xyes; then
elif test -f "$KRB5CONFIG"; then
dnl krb5-config doesn't have --libs-only-L or similar, put everything
dnl into LIBS
- gss_libs=`$KRB5CONFIG --libs gssapi`
+ gss_libs=`$KRB5CONFIG --libs mit-krb5-gssapi`
LIBS="$gss_libs $LIBS"
else
case $host in
--
1.9.1

5
meta/recipes-support/curl/curl_7.47.1.bb
View File

@@ -5,7 +5,9 @@ SECTION = "console/network"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://COPYING;beginline=8;md5=3a34942f4ae3fbf1a303160714e664ac"
SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2"
SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
file://0001-replace-krb5-config-with-pkg-config.patch \
"
# curl likes to set -g0 in CFLAGS, so we stop it
# from mucking around with debug options
@@ -40,6 +42,7 @@ PACKAGECONFIG[ssl] = "--with-ssl --with-random=/dev/urandom,--without-ssl,openss
PACKAGECONFIG[telnet] = "--enable-telnet,--disable-telnet,"
PACKAGECONFIG[tftp] = "--enable-tftp,--disable-tftp,"
PACKAGECONFIG[zlib] = "--with-zlib=${STAGING_LIBDIR}/../,--without-zlib,zlib"
PACKAGECONFIG[krb5] = "--with-gssapi,--without-gssapi,krb5"
EXTRA_OECONF = " \
--enable-crypto-auth \