diff options
author | Andre McCurdy <armccurdy@gmail.com> | 2014-08-13 00:36:54 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-08-15 18:21:51 +0100 |
commit | c076959b3c7b82ac8e499de51e37dd83263029d1 (patch) | |
tree | b4cecf2da0baec09acb71ed7bbaab1d7956e7fff /meta | |
parent | 89d3db7c89793e73ae28cf709f90317588d11846 (diff) | |
download | poky-c076959b3c7b82ac8e499de51e37dd83263029d1.tar.gz |
curl: let configure find gnutls via pkg-config
(From OE-Core rev: 3682d661f3b3a6fa7d9ef37968746cbaf1ede078)
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-support/curl/curl_7.37.1.bb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/meta/recipes-support/curl/curl_7.37.1.bb b/meta/recipes-support/curl/curl_7.37.1.bb index e51e06d522..4b7f9ec922 100644 --- a/meta/recipes-support/curl/curl_7.37.1.bb +++ b/meta/recipes-support/curl/curl_7.37.1.bb | |||
@@ -25,7 +25,7 @@ PACKAGECONFIG_class-nativesdk = "ipv6 ssl zlib" | |||
25 | 25 | ||
26 | PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," | 26 | PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," |
27 | PACKAGECONFIG[ssl] = "--with-ssl,--without-ssl,openssl" | 27 | PACKAGECONFIG[ssl] = "--with-ssl,--without-ssl,openssl" |
28 | PACKAGECONFIG[gnutls] = "--with-gnutls=${STAGING_LIBDIR}/../,--without-gnutls,gnutls" | 28 | PACKAGECONFIG[gnutls] = "--with-gnutls,--without-gnutls,gnutls" |
29 | PACKAGECONFIG[zlib] = "--with-zlib=${STAGING_LIBDIR}/../,--without-zlib,zlib" | 29 | PACKAGECONFIG[zlib] = "--with-zlib=${STAGING_LIBDIR}/../,--without-zlib,zlib" |
30 | 30 | ||
31 | EXTRA_OECONF = "--without-libssh2 \ | 31 | EXTRA_OECONF = "--without-libssh2 \ |
@@ -37,10 +37,6 @@ EXTRA_OECONF = "--without-libssh2 \ | |||
37 | --with-ca-bundle=${sysconfdir}/ssl/certs/ca-certificates.crt \ | 37 | --with-ca-bundle=${sysconfdir}/ssl/certs/ca-certificates.crt \ |
38 | " | 38 | " |
39 | 39 | ||
40 | do_configure_prepend() { | ||
41 | sed -i s:OPT_GNUTLS/bin:OPT_GNUTLS:g ${S}/configure.ac | ||
42 | } | ||
43 | |||
44 | do_install_append() { | 40 | do_install_append() { |
45 | oe_multilib_header curl/curlbuild.h | 41 | oe_multilib_header curl/curlbuild.h |
46 | } | 42 | } |