From: Richard Purdie Date: Thu, 12 Nov 2009 14:44:51 +0000 (+0000) Subject: curl: Drop unneeded custom staging functions X-Git-Tag: Release-2010-05/1~1712 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc161c965f86874169fc78eefc7626ad203df18a;p=openembedded.git curl: Drop unneeded custom staging functions Signed-off-by: Richard Purdie --- diff --git a/recipes/curl/curl-common.inc b/recipes/curl/curl-common.inc index 4af85ba58d..41c5d919c5 100644 --- a/recipes/curl/curl-common.inc +++ b/recipes/curl/curl-common.inc @@ -6,7 +6,7 @@ SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ file://pkgconfig_fix.patch;patch=1" S = "${WORKDIR}/curl-${PV}" -INC_PR = "r2" +INC_PR = "r3" CURL_FEATURES ?= "zlib,gnutls,cookies,crypto-auth,dict,file,ftp,http,telnet,tftp" # other allowed features: ipv6, ares, openssl @@ -62,7 +62,5 @@ do_configure_prepend() { } do_stage () { - install -d ${STAGING_INCDIR}/curl - install -m 0644 ${S}/include/curl/*.h ${STAGING_INCDIR}/curl/ - oe_libinstall -so -a -C lib libcurl ${STAGING_LIBDIR} + autotools_stage_all } diff --git a/recipes/curl/curl-native_7.18.2.bb b/recipes/curl/curl-native_7.18.2.bb index d395021512..1eef23b29c 100644 --- a/recipes/curl/curl-native_7.18.2.bb +++ b/recipes/curl/curl-native_7.18.2.bb @@ -2,11 +2,3 @@ require curl-common.inc inherit native DEPENDS = "zlib-native" PR = "${INC_PR}.1" - -do_stage () { - autotools_stage_all -} - -do_install() { - : -} diff --git a/recipes/curl/curl-native_7.19.6.bb b/recipes/curl/curl-native_7.19.6.bb index b201530cf6..392476b745 100644 --- a/recipes/curl/curl-native_7.19.6.bb +++ b/recipes/curl/curl-native_7.19.6.bb @@ -4,11 +4,3 @@ DEPENDS = "zlib-native" PR = "${INC_PR}.2" CURL_FEATURES = "zlib,cookies,crypto-auth,dict,file,ftp,http,telnet,tftp" - -do_stage () { - autotools_stage_all -} - -do_install() { - : -} diff --git a/recipes/curl/curl-sdk_7.18.2.bb b/recipes/curl/curl-sdk_7.18.2.bb index 8eed3d664a..f1fd34ff2c 100644 --- a/recipes/curl/curl-sdk_7.18.2.bb +++ b/recipes/curl/curl-sdk_7.18.2.bb @@ -2,13 +2,3 @@ require curl-common.inc inherit sdk DEPENDS = "zlib-sdk" PR = "${INC_PR}.1" - -do_stage () { - install -d ${STAGING_INCDIR}/curl - install -m 0644 ${S}/include/curl/*.h ${STAGING_INCDIR}/curl/ - oe_libinstall -so -a -C lib libcurl ${STAGING_LIBDIR} -} - -do_install() { - : -}