summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/curl/curl/0001-replace-krb5-config-with-pkg-config.patch
diff options
context:
space:
mode:
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.patch44
1 files changed, 0 insertions, 44 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
deleted file mode 100644
index a7db1b3c9e..0000000000
--- a/meta/recipes-support/curl/curl/0001-replace-krb5-config-with-pkg-config.patch
+++ /dev/null
@@ -1,44 +0,0 @@
1From ed70f0623708b8a6c1f58a5d243d87c5ff45b24d Mon Sep 17 00:00:00 2001
2From: Roy Li <rongqing.li@windriver.com>
3Date: Tue, 26 Apr 2016 13:13:01 +0800
4Subject: [PATCH] replace krb5-config with pkg-config
5
6Upstream-Status: Pending
7
8Signed-off-by: Roy Li <rongqing.li@windriver.com>
9
10---
11 configure.ac | 6 +++---
12 1 file changed, 3 insertions(+), 3 deletions(-)
13
14diff --git a/configure.ac b/configure.ac
15index 5569a26..56b0380 100755
16--- a/configure.ac
17+++ b/configure.ac
18@@ -1290,7 +1290,7 @@ AC_ARG_WITH(gssapi,
19 fi
20 ])
21
22-: ${KRB5CONFIG:="$GSSAPI_ROOT/bin/krb5-config"}
23+KRB5CONFIG=`which pkg-config`
24
25 save_CPPFLAGS="$CPPFLAGS"
26 AC_MSG_CHECKING([if GSS-API support is requested])
27@@ -1301,7 +1301,7 @@ if test x"$want_gss" = xyes; then
28 if test -n "$host_alias" -a -f "$GSSAPI_ROOT/bin/$host_alias-krb5-config"; then
29 GSSAPI_INCS=`$GSSAPI_ROOT/bin/$host_alias-krb5-config --cflags gssapi`
30 elif test -f "$KRB5CONFIG"; then
31- GSSAPI_INCS=`$KRB5CONFIG --cflags gssapi`
32+ GSSAPI_INCS=`$KRB5CONFIG --cflags mit-krb5-gssapi`
33 elif test "$GSSAPI_ROOT" != "yes"; then
34 GSSAPI_INCS="-I$GSSAPI_ROOT/include"
35 fi
36@@ -1394,7 +1394,7 @@ if test x"$want_gss" = xyes; then
37 elif test -f "$KRB5CONFIG"; then
38 dnl krb5-config doesn't have --libs-only-L or similar, put everything
39 dnl into LIBS
40- gss_libs=`$KRB5CONFIG --libs gssapi`
41+ gss_libs=`$KRB5CONFIG --libs mit-krb5-gssapi`
42 LIBS="$gss_libs $LIBS"
43 else
44 case $host in