summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support
diff options
context:
space:
mode:
authorQing He <qing.he@intel.com>2010-11-17 16:26:58 +0800
committerSaul Wold <sgw@linux.intel.com>2010-11-22 10:30:30 -0800
commit89ab1ace5db6db12f012fa8520b3d25834af66aa (patch)
tree9efa187fce4e1c45d243bbfef14a823433e34abe /meta/recipes-support
parent4d6a8d257417997713002101469357fd0a19d2f5 (diff)
downloadpoky-89ab1ace5db6db12f012fa8520b3d25834af66aa.tar.gz
curl: fix native dependency
disable gnutls for -native also fix --with-gnutls parameter for target Signed-off-by: Qing He <qing.he@intel.com>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r--meta/recipes-support/curl/curl_7.21.2.bb7
1 files changed, 5 insertions, 2 deletions
diff --git a/meta/recipes-support/curl/curl_7.21.2.bb b/meta/recipes-support/curl/curl_7.21.2.bb
index 1e11222897..fd1d5ddf75 100644
--- a/meta/recipes-support/curl/curl_7.21.2.bb
+++ b/meta/recipes-support/curl/curl_7.21.2.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;beginline=7;md5=3a34942f4ae3fbf1a303160714e66
8DEPENDS = "zlib gnutls" 8DEPENDS = "zlib gnutls"
9DEPENDS_virtclass-native = "zlib-native" 9DEPENDS_virtclass-native = "zlib-native"
10DEPENDS_virtclass-nativesdk = "zlib-nativesdk" 10DEPENDS_virtclass-nativesdk = "zlib-nativesdk"
11PR = "r0" 11PR = "r1"
12 12
13SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ 13SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
14 file://noldlibpath.patch \ 14 file://noldlibpath.patch \
@@ -17,7 +17,6 @@ SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
17inherit autotools pkgconfig binconfig 17inherit autotools pkgconfig binconfig
18 18
19EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \ 19EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \
20 --with-gnutls=${STAGING_BINDIR_CROSS}/ \
21 --without-ssl \ 20 --without-ssl \
22 --without-libssh2 \ 21 --without-libssh2 \
23 --with-random=/dev/urandom \ 22 --with-random=/dev/urandom \
@@ -25,6 +24,10 @@ EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \
25 --enable-crypto-auth \ 24 --enable-crypto-auth \
26 " 25 "
27 26
27EXTRA_OECONF_append = " --with-gnutls=${STAGING_LIBDIR}/../"
28EXTRA_OECONF_virtclass-native_append = " --without-gnutls"
29EXTRA_OECONF_virtclass-nativesdk_append = " --without-gnutls"
30
28do_configure_prepend() { 31do_configure_prepend() {
29 sed -i s:OPT_GNUTLS/bin:OPT_GNUTLS:g configure.ac 32 sed -i s:OPT_GNUTLS/bin:OPT_GNUTLS:g configure.ac
30} 33}