Patchwork [10/10] curl: Convert CURLGNUTL to PACKAGECONFIG

login
register
mail settings
Submitter Saul Wold
Date June 25, 2014, 12:13 a.m.
Message ID <e33bb2eefbdda30378a55346ff60fb0fb90baff2.1403654908.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/74333/
State Accepted
Commit 97294829cde141c8b6b50418de27f53507f5764e
Headers show

Comments

Saul Wold - June 25, 2014, 12:13 a.m.
This will allow for easier configuration of curl for SSL vs gnutls

[YOCTO #6329]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-support/curl/curl_7.37.0.bb | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)
Martin Jansa - Sept. 25, 2014, 7:27 p.m.
On Tue, Jun 24, 2014 at 05:13:20PM -0700, Saul Wold wrote:
> This will allow for easier configuration of curl for SSL vs gnutls
> 
> [YOCTO #6329]
> 
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
>  meta/recipes-support/curl/curl_7.37.0.bb | 18 +++++++-----------
>  1 file changed, 7 insertions(+), 11 deletions(-)
> 
> diff --git a/meta/recipes-support/curl/curl_7.37.0.bb b/meta/recipes-support/curl/curl_7.37.0.bb
> index 1dc4ff3..f6b05a7 100644
> --- a/meta/recipes-support/curl/curl_7.37.0.bb
> +++ b/meta/recipes-support/curl/curl_7.37.0.bb
> @@ -23,6 +23,13 @@ SRC_URI[sha256sum] = "24502492de3168b0556d8e1a06f14f7589e57b204917d602a572e14239
>  
>  inherit autotools pkgconfig binconfig multilib_header
>  
> +PACKAGECONFIG ??= "gnutls ${@bb.utils.contains("DISTRO_FEATURES", "ipv6", "ipv6", "", d)}"
> +PACKAGECONFIG_class-native = "ipv6 ssl"
> +PACKAGECONFIG_class-nativesdk = "ipv6"
> +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
> +PACKAGECONFIG[ssl] =  "--with-ssl, --without-ssl, ,"
> +PACKAGECONFIG[gnutls] =  "--with-gnutls=${STAGING_LIBDIR}/../, --without-gnutls, gnutls,"

Can you look into this floating dependency?

curl-7.37.1: libcurl rdepends on rtmpdump, but it isn't a build dependency? [build-deps]

It seems to spread into more packages (maybe not all through curl):
curlpp-0.7.3: libcurlpp rdepends on rtmpdump, but it isn't a build dependency? [build-deps]
gst-plugins-bad-0.10.23: gst-plugins-bad-curl rdepends on rtmpdump, but it isn't a build dependency? [build-deps]
gst-plugins-bad-0.10.23: gst-plugins-bad-rtmp rdepends on rtmpdump, but it isn't a build dependency? [build-deps]
gst-plugins-bad-0.10.23: gst-plugins-bad-rtmp rdepends on libcrypto, but it isn't a build dependency? [build-deps]
gst-plugins-bad-0.10.23: gst-plugins-bad-rtmp rdepends on libssl, but it isn't a build dependency? [build-deps]
gstreamer1.0-plugins-bad-1.4.1: gstreamer1.0-plugins-bad-curl rdepends on rtmpdump, but it isn't a build dependency? [build-deps]
libetpan-0.57: libetpan rdepends on rtmpdump, but it isn't a build dependency? [build-deps]
liboauth-1.0.3: liboauth rdepends on rtmpdump, but it isn't a build dependency? [build-deps]
strongswan-5.2.0: strongswan rdepends on rtmpdump, but it isn't a build dependency? [build-deps]

> +
>  EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \
>                  --without-libssh2 \
>                  --with-random=/dev/urandom \
> @@ -31,19 +38,8 @@ EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \
>                  --disable-ldap \
>                  --disable-ldaps \
>                  --with-ca-bundle=${sysconfdir}/ssl/certs/ca-certificates.crt \
> -                ${CURLGNUTLS} \
>                  "
>  
> -CURLGNUTLS = " --with-gnutls=${STAGING_LIBDIR}/../ --without-ssl"
> -CURLGNUTLS_class-native = "--without-gnutls --with-ssl"
> -CURLGNUTLS_class-nativesdk = "--without-gnutls --without-ssl"
> -
> -PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "ipv6", "ipv6", "", d)}"
> -PACKAGECONFIG_class-native = "ipv6"
> -PACKAGECONFIG_class-nativesdk = "ipv6"
> -
> -PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
> -
>  do_configure_prepend() {
>  	sed -i s:OPT_GNUTLS/bin:OPT_GNUTLS:g ${S}/configure.ac
>  }
> -- 
> 1.8.3.1
> 
> -- 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
Ross Burton - Sept. 25, 2014, 10:44 p.m.
On 25 September 2014 20:27, Martin Jansa <martin.jansa@gmail.com> wrote:
> Can you look into this floating dependency?
>
> curl-7.37.1: libcurl rdepends on rtmpdump, but it isn't a build dependency? [build-deps]

Thanks for the heads up, patch incoming.

Ross

Patch

diff --git a/meta/recipes-support/curl/curl_7.37.0.bb b/meta/recipes-support/curl/curl_7.37.0.bb
index 1dc4ff3..f6b05a7 100644
--- a/meta/recipes-support/curl/curl_7.37.0.bb
+++ b/meta/recipes-support/curl/curl_7.37.0.bb
@@ -23,6 +23,13 @@  SRC_URI[sha256sum] = "24502492de3168b0556d8e1a06f14f7589e57b204917d602a572e14239
 
 inherit autotools pkgconfig binconfig multilib_header
 
+PACKAGECONFIG ??= "gnutls ${@bb.utils.contains("DISTRO_FEATURES", "ipv6", "ipv6", "", d)}"
+PACKAGECONFIG_class-native = "ipv6 ssl"
+PACKAGECONFIG_class-nativesdk = "ipv6"
+PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
+PACKAGECONFIG[ssl] =  "--with-ssl, --without-ssl, ,"
+PACKAGECONFIG[gnutls] =  "--with-gnutls=${STAGING_LIBDIR}/../, --without-gnutls, gnutls,"
+
 EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \
                 --without-libssh2 \
                 --with-random=/dev/urandom \
@@ -31,19 +38,8 @@  EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \
                 --disable-ldap \
                 --disable-ldaps \
                 --with-ca-bundle=${sysconfdir}/ssl/certs/ca-certificates.crt \
-                ${CURLGNUTLS} \
                 "
 
-CURLGNUTLS = " --with-gnutls=${STAGING_LIBDIR}/../ --without-ssl"
-CURLGNUTLS_class-native = "--without-gnutls --with-ssl"
-CURLGNUTLS_class-nativesdk = "--without-gnutls --without-ssl"
-
-PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "ipv6", "ipv6", "", d)}"
-PACKAGECONFIG_class-native = "ipv6"
-PACKAGECONFIG_class-nativesdk = "ipv6"
-
-PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
-
 do_configure_prepend() {
 	sed -i s:OPT_GNUTLS/bin:OPT_GNUTLS:g ${S}/configure.ac
 }