diff options
Diffstat (limited to 'meta/recipes-support/curl/curl_7.24.0.bb')
-rw-r--r-- | meta/recipes-support/curl/curl_7.24.0.bb | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/meta/recipes-support/curl/curl_7.24.0.bb b/meta/recipes-support/curl/curl_7.24.0.bb index f9dce7de12..2c5369c014 100644 --- a/meta/recipes-support/curl/curl_7.24.0.bb +++ b/meta/recipes-support/curl/curl_7.24.0.bb | |||
@@ -5,10 +5,10 @@ SECTION = "console/network" | |||
5 | LICENSE = "MIT" | 5 | LICENSE = "MIT" |
6 | LIC_FILES_CHKSUM = "file://COPYING;beginline=7;md5=3a34942f4ae3fbf1a303160714e664ac" | 6 | LIC_FILES_CHKSUM = "file://COPYING;beginline=7;md5=3a34942f4ae3fbf1a303160714e664ac" |
7 | 7 | ||
8 | DEPENDS = "zlib gnutls openssl" | 8 | DEPENDS = "zlib gnutls" |
9 | DEPENDS_virtclass-native = "zlib-native openssl-native" | 9 | DEPENDS_virtclass-native = "zlib-native openssl-native" |
10 | DEPENDS_virtclass-nativesdk = "zlib-nativesdk openssl-nativesdk" | 10 | DEPENDS_virtclass-nativesdk = "zlib-nativesdk" |
11 | PR = "r1" | 11 | PR = "r2" |
12 | 12 | ||
13 | SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ | 13 | SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ |
14 | file://noldlibpath.patch \ | 14 | file://noldlibpath.patch \ |
@@ -20,7 +20,6 @@ SRC_URI[sha256sum] = "ebdb111088ff8b0e05b1d1b075e9f1608285e8105cc51e21caacf33d01 | |||
20 | inherit autotools pkgconfig binconfig | 20 | inherit autotools pkgconfig binconfig |
21 | 21 | ||
22 | EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \ | 22 | EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \ |
23 | --with-ssl \ | ||
24 | --without-libssh2 \ | 23 | --without-libssh2 \ |
25 | --with-random=/dev/urandom \ | 24 | --with-random=/dev/urandom \ |
26 | --without-libidn \ | 25 | --without-libidn \ |
@@ -28,9 +27,9 @@ EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \ | |||
28 | ${CURLGNUTLS} \ | 27 | ${CURLGNUTLS} \ |
29 | " | 28 | " |
30 | 29 | ||
31 | CURLGNUTLS = " --with-gnutls=${STAGING_LIBDIR}/../" | 30 | CURLGNUTLS = " --with-gnutls=${STAGING_LIBDIR}/../ --without-ssl" |
32 | CURLGNUTLS_virtclass-native = "--without-gnutls" | 31 | CURLGNUTLS_virtclass-native = "--without-gnutls --with-ssl" |
33 | CURLGNUTLS_virtclass-nativesdk = "--without-gnutls" | 32 | CURLGNUTLS_virtclass-nativesdk = "--without-gnutls --without-ssl" |
34 | 33 | ||
35 | do_configure_prepend() { | 34 | do_configure_prepend() { |
36 | sed -i s:OPT_GNUTLS/bin:OPT_GNUTLS:g configure.ac | 35 | sed -i s:OPT_GNUTLS/bin:OPT_GNUTLS:g configure.ac |