diff options
author | Andre McCurdy <armccurdy@gmail.com> | 2018-05-18 17:42:34 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-05-29 11:25:06 +0100 |
commit | 4063c1e4b233b28ae14420a83960fd93b437a4a4 (patch) | |
tree | 6806b766730a9839df6586d51a552435124d29ba /meta/recipes-support/curl/curl/0001-replace-krb5-config-with-pkg-config.patch | |
parent | 9a9330aebe201078a47441e1ef9a19a659017ba8 (diff) | |
download | openembedded-core-4063c1e4b233b28ae14420a83960fd93b437a4a4.tar.gz |
curl: update 7.59.0 -> 7.60.0
https://curl.haxx.se/changes.html#7_60_0
Also refresh 0001-replace-krb5-config-with-pkg-config.patch and drop
configure_ac.patch, which we've apparently been dragging along
unnecessarily for the past 5 years:
https://github.com/curl/curl/commit/c277bd6ce7069819484eb3dc30b5858735fde377
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
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 | 17 |
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 @@ -[PATCH] replace krb5-config with pkg-config +From ed70f0623708b8a6c1f58a5d243d87c5ff45b24d Mon Sep 17 00:00:00 2001 +From: Roy Li <rongqing.li@windriver.com> +Date: Tue, 26 Apr 2016 13:13:01 +0800 +Subject: [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 +index 5569a26..56b0380 100755 --- a/configure.ac +++ b/configure.ac -@@ -1196,7 +1196,7 @@ AC_ARG_WITH(gssapi, +@@ -1290,7 +1290,7 @@ AC_ARG_WITH(gssapi, fi ]) @@ -20,7 +24,7 @@ index e99b303..dc93f39 100644 save_CPPFLAGS="$CPPFLAGS" AC_MSG_CHECKING([if GSS-API support is requested]) -@@ -1207,7 +1207,7 @@ if test x"$want_gss" = xyes; then +@@ -1301,7 +1301,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 @@ -29,7 +33,7 @@ index e99b303..dc93f39 100644 elif test "$GSSAPI_ROOT" != "yes"; then GSSAPI_INCS="-I$GSSAPI_ROOT/include" fi -@@ -1300,7 +1300,7 @@ if test x"$want_gss" = xyes; then +@@ -1394,7 +1394,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 @@ -38,6 +42,3 @@ index e99b303..dc93f39 100644 LIBS="$gss_libs $LIBS" else case $host in --- -1.9.1 - |