From 3b408bf7c83901c6fec4a1c6be0205cb22f251c1 Mon Sep 17 00:00:00 2001 From: Michael Smith Date: Fri, 23 Oct 2009 11:14:34 -0400 Subject: curl: support openssl in CURL_FEATURES. Default is still gnutls. Also switch to INC_PR. Signed-off-by: Michael Smith --- recipes/curl/curl-common.inc | 10 ++++++++-- recipes/curl/curl-native_7.18.2.bb | 2 +- recipes/curl/curl-native_7.19.6.bb | 1 + recipes/curl/curl-sdk_7.18.2.bb | 2 +- recipes/curl/curl_7.18.2.bb | 2 +- recipes/curl/curl_7.19.5.bb | 2 +- recipes/curl/curl_7.19.6.bb | 1 + 7 files changed, 14 insertions(+), 6 deletions(-) (limited to 'recipes/curl') diff --git a/recipes/curl/curl-common.inc b/recipes/curl/curl-common.inc index ce4f5f2a8e..29af47ee8d 100644 --- a/recipes/curl/curl-common.inc +++ b/recipes/curl/curl-common.inc @@ -6,8 +6,10 @@ SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ file://pkgconfig_fix.patch;patch=1" S = "${WORKDIR}/curl-${PV}" +INC_PR = "r2" + CURL_FEATURES ?= "zlib,gnutls,cookies,crypto-auth,dict,file,ftp,http,telnet,tftp" -# other allowed features: ipv6, ares +# other allowed features: ipv6, ares, openssl inherit autotools pkgconfig binconfig @@ -15,7 +17,6 @@ EXTRA_OECONF = " \ --without-libssh2 \ --with-random=/dev/urandom \ --without-libidn \ - --without-ssl \ " python __anonymous() { @@ -37,6 +38,11 @@ python __anonymous() { deps.append("gnutls") else: oeconf += " --without-gnutls" + if 'openssl' in f: + oeconf += " --with-ssl=${STAGING_LIBDIR}/../" + deps.append("openssl") + else: + oeconf += " --without-ssl" if 'ares' in f: oeconf += " --enable-ares" deps.append("c-ares") diff --git a/recipes/curl/curl-native_7.18.2.bb b/recipes/curl/curl-native_7.18.2.bb index c95591b70b..d395021512 100644 --- a/recipes/curl/curl-native_7.18.2.bb +++ b/recipes/curl/curl-native_7.18.2.bb @@ -1,7 +1,7 @@ require curl-common.inc inherit native DEPENDS = "zlib-native" -PR = "r1" +PR = "${INC_PR}.1" do_stage () { autotools_stage_all diff --git a/recipes/curl/curl-native_7.19.6.bb b/recipes/curl/curl-native_7.19.6.bb index 2f49ad1d31..d395021512 100644 --- a/recipes/curl/curl-native_7.19.6.bb +++ b/recipes/curl/curl-native_7.19.6.bb @@ -1,6 +1,7 @@ require curl-common.inc inherit native DEPENDS = "zlib-native" +PR = "${INC_PR}.1" do_stage () { autotools_stage_all diff --git a/recipes/curl/curl-sdk_7.18.2.bb b/recipes/curl/curl-sdk_7.18.2.bb index 35b0d8883f..8eed3d664a 100644 --- a/recipes/curl/curl-sdk_7.18.2.bb +++ b/recipes/curl/curl-sdk_7.18.2.bb @@ -1,7 +1,7 @@ require curl-common.inc inherit sdk DEPENDS = "zlib-sdk" -PR = "r1" +PR = "${INC_PR}.1" do_stage () { install -d ${STAGING_INCDIR}/curl diff --git a/recipes/curl/curl_7.18.2.bb b/recipes/curl/curl_7.18.2.bb index 3de6da4fec..84c0d07e61 100644 --- a/recipes/curl/curl_7.18.2.bb +++ b/recipes/curl/curl_7.18.2.bb @@ -1,4 +1,4 @@ require curl-common.inc require curl-target.inc -PR = "r1" +PR = "${INC_PR}.1" diff --git a/recipes/curl/curl_7.19.5.bb b/recipes/curl/curl_7.19.5.bb index b5b6182e8d..d0577b06aa 100644 --- a/recipes/curl/curl_7.19.5.bb +++ b/recipes/curl/curl_7.19.5.bb @@ -3,4 +3,4 @@ require curl-target.inc SRC_URI += "file://off_t_abi_fix.patch;patch=1;pnum=0 \ file://curl-add_all_algorithms.patch;patch=1" -PR = "r1" +PR = "${INC_PR}.1" diff --git a/recipes/curl/curl_7.19.6.bb b/recipes/curl/curl_7.19.6.bb index d5ca1bb268..e8319b80ed 100644 --- a/recipes/curl/curl_7.19.6.bb +++ b/recipes/curl/curl_7.19.6.bb @@ -2,3 +2,4 @@ require curl-common.inc require curl-target.inc SRC_URI += "file://off_t_abi_fix.patch;patch=1;pnum=0" +PR = "${INC_PR}.1" -- cgit 1.2.3-korg