diff options
Diffstat (limited to 'meta/recipes-support/curl')
| -rw-r--r-- | meta/recipes-support/curl/curl/0001-replace-krb5-config-with-pkg-config.patch | 17 | ||||
| -rw-r--r-- | meta/recipes-support/curl/curl/configure_ac.patch | 13 | ||||
| -rw-r--r-- | meta/recipes-support/curl/curl_7.60.0.bb (renamed from meta/recipes-support/curl/curl_7.59.0.bb) | 15 |
3 files changed, 13 insertions, 32 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 - diff --git a/meta/recipes-support/curl/curl/configure_ac.patch b/meta/recipes-support/curl/curl/configure_ac.patch deleted file mode 100644 index b8bd304d71..0000000000 --- a/meta/recipes-support/curl/curl/configure_ac.patch +++ /dev/null @@ -1,13 +0,0 @@ -Upstream-Status: Pending - ---- a/configure.ac -+++ b/configure.ac -@@ -281,7 +281,7 @@ dnl ************************************ - - CURL_CHECK_COMPILER - CURL_SET_COMPILER_BASIC_OPTS --CURL_SET_COMPILER_DEBUG_OPTS -+dnl CURL_SET_COMPILER_DEBUG_OPTS - CURL_SET_COMPILER_OPTIMIZE_OPTS - CURL_SET_COMPILER_WARNING_OPTS - diff --git a/meta/recipes-support/curl/curl_7.59.0.bb b/meta/recipes-support/curl/curl_7.60.0.bb index c244c60d69..fe04fa63c9 100644 --- a/meta/recipes-support/curl/curl_7.59.0.bb +++ b/meta/recipes-support/curl/curl_7.60.0.bb @@ -9,14 +9,8 @@ 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 -# -SRC_URI += " file://configure_ac.patch" - -SRC_URI[md5sum] = "a2192804f7c2636a09320416afcf888e" -SRC_URI[sha256sum] = "b5920ffd6a8c95585fb95070e0ced38322790cb335c39d0dab852d12e157b5a0" +SRC_URI[md5sum] = "bd2aabf78ded6a9aec8a54532fd6b5d7" +SRC_URI[sha256sum] = "897dfb2204bd99be328279f88f55b7c61592216b0542fcbe995c60aa92871e9b" CVE_PRODUCT = "libcurl" inherit autotools pkgconfig binconfig multilib_header @@ -32,10 +26,12 @@ PACKAGECONFIG[gnutls] = "--with-gnutls,--without-gnutls,gnutls" PACKAGECONFIG[gopher] = "--enable-gopher,--disable-gopher," PACKAGECONFIG[imap] = "--enable-imap,--disable-imap," PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," +PACKAGECONFIG[krb5] = "--with-gssapi,--without-gssapi,krb5" PACKAGECONFIG[ldap] = "--enable-ldap,--disable-ldap," PACKAGECONFIG[ldaps] = "--enable-ldaps,--disable-ldaps," PACKAGECONFIG[libidn] = "--with-libidn2,--without-libidn2,libidn2" PACKAGECONFIG[libssh2] = "--with-libssh2,--without-libssh2,libssh2" +PACKAGECONFIG[nghttp2] = "--with-nghttp2,--without-nghttp2,nghttp2" PACKAGECONFIG[pop3] = "--enable-pop3,--disable-pop3," PACKAGECONFIG[proxy] = "--enable-proxy,--disable-proxy," PACKAGECONFIG[rtmpdump] = "--with-librtmp,--without-librtmp,rtmpdump" @@ -47,8 +43,6 @@ PACKAGECONFIG[telnet] = "--enable-telnet,--disable-telnet," PACKAGECONFIG[tftp] = "--enable-tftp,--disable-tftp," PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver" PACKAGECONFIG[zlib] = "--with-zlib=${STAGING_LIBDIR}/../,--without-zlib,zlib" -PACKAGECONFIG[krb5] = "--with-gssapi,--without-gssapi,krb5" -PACKAGECONFIG[nghttp2] = "--with-nghttp2,--without-nghttp2,nghttp2" EXTRA_OECONF = " \ --enable-crypto-auth \ @@ -57,7 +51,6 @@ EXTRA_OECONF = " \ --without-libpsl \ " - do_install_append_class-target() { # cleanup buildpaths from curl-config sed -i \ |