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.patch17
1 files changed, 9 insertions, 8 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
index 74e5d99cf2..a7db1b3c9e 100644
--- 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
@@ -1,17 +1,21 @@
1[PATCH] replace krb5-config with pkg-config 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
2 5
3Upstream-Status: Pending 6Upstream-Status: Pending
4 7
5Signed-off-by: Roy Li <rongqing.li@windriver.com> 8Signed-off-by: Roy Li <rongqing.li@windriver.com>
9
6--- 10---
7 configure.ac | 6 +++--- 11 configure.ac | 6 +++---
8 1 file changed, 3 insertions(+), 3 deletions(-) 12 1 file changed, 3 insertions(+), 3 deletions(-)
9 13
10diff --git a/configure.ac b/configure.ac 14diff --git a/configure.ac b/configure.ac
11index e99b303..dc93f39 100644 15index 5569a26..56b0380 100755
12--- a/configure.ac 16--- a/configure.ac
13+++ b/configure.ac 17+++ b/configure.ac
14@@ -1196,7 +1196,7 @@ AC_ARG_WITH(gssapi, 18@@ -1290,7 +1290,7 @@ AC_ARG_WITH(gssapi,
15 fi 19 fi
16 ]) 20 ])
17 21
@@ -20,7 +24,7 @@ index e99b303..dc93f39 100644
20 24
21 save_CPPFLAGS="$CPPFLAGS" 25 save_CPPFLAGS="$CPPFLAGS"
22 AC_MSG_CHECKING([if GSS-API support is requested]) 26 AC_MSG_CHECKING([if GSS-API support is requested])
23@@ -1207,7 +1207,7 @@ if test x"$want_gss" = xyes; then 27@@ -1301,7 +1301,7 @@ if test x"$want_gss" = xyes; then
24 if test -n "$host_alias" -a -f "$GSSAPI_ROOT/bin/$host_alias-krb5-config"; then 28 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` 29 GSSAPI_INCS=`$GSSAPI_ROOT/bin/$host_alias-krb5-config --cflags gssapi`
26 elif test -f "$KRB5CONFIG"; then 30 elif test -f "$KRB5CONFIG"; then
@@ -29,7 +33,7 @@ index e99b303..dc93f39 100644
29 elif test "$GSSAPI_ROOT" != "yes"; then 33 elif test "$GSSAPI_ROOT" != "yes"; then
30 GSSAPI_INCS="-I$GSSAPI_ROOT/include" 34 GSSAPI_INCS="-I$GSSAPI_ROOT/include"
31 fi 35 fi
32@@ -1300,7 +1300,7 @@ if test x"$want_gss" = xyes; then 36@@ -1394,7 +1394,7 @@ if test x"$want_gss" = xyes; then
33 elif test -f "$KRB5CONFIG"; then 37 elif test -f "$KRB5CONFIG"; then
34 dnl krb5-config doesn't have --libs-only-L or similar, put everything 38 dnl krb5-config doesn't have --libs-only-L or similar, put everything
35 dnl into LIBS 39 dnl into LIBS
@@ -38,6 +42,3 @@ index e99b303..dc93f39 100644
38 LIBS="$gss_libs $LIBS" 42 LIBS="$gss_libs $LIBS"
39 else 43 else
40 case $host in 44 case $host in
41--
421.9.1
43