diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/packages/curl/curl-native_7.18.0.bb | 10 | ||||
-rw-r--r-- | meta/packages/curl/curl-sdk_7.18.0.bb | 10 | ||||
-rw-r--r-- | meta/packages/curl/curl_7.18.0.bb | 9 |
3 files changed, 2 insertions, 27 deletions
diff --git a/meta/packages/curl/curl-native_7.18.0.bb b/meta/packages/curl/curl-native_7.18.0.bb index e056ec10c..880caac7c 100644 --- a/meta/packages/curl/curl-native_7.18.0.bb +++ b/meta/packages/curl/curl-native_7.18.0.bb @@ -2,13 +2,3 @@ require curl_${PV}.bb inherit native DEPENDS = "zlib-native" -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() { - : -} - diff --git a/meta/packages/curl/curl-sdk_7.18.0.bb b/meta/packages/curl/curl-sdk_7.18.0.bb index 816fe645b..f15e2db39 100644 --- a/meta/packages/curl/curl-sdk_7.18.0.bb +++ b/meta/packages/curl/curl-sdk_7.18.0.bb @@ -2,13 +2,3 @@ require curl_${PV}.bb inherit sdk DEPENDS = "zlib-sdk" -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() { - : -} - diff --git a/meta/packages/curl/curl_7.18.0.bb b/meta/packages/curl/curl_7.18.0.bb index ae2cff6e1..cf4926bfb 100644 --- a/meta/packages/curl/curl_7.18.0.bb +++ b/meta/packages/curl/curl_7.18.0.bb @@ -2,12 +2,13 @@ DESCRIPTION = "Command line tool and library for client-side URL transfers." LICENSE = "MIT" DEPENDS = "zlib gnutls" SECTION = "console/network" +PR = "r1" SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ file://pkgconfig_fix.patch;patch=1" S = "${WORKDIR}/curl-${PV}" -inherit autotools pkgconfig binconfig +inherit autotools_stage pkgconfig binconfig EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \ --with-gnutls=${STAGING_BINDIR_CROSS}/ \ @@ -22,12 +23,6 @@ do_configure_prepend() { sed -i s:OPT_GNUTLS/bin:OPT_GNUTLS:g configure.ac } -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} -} - PACKAGES += "${PN}-certs libcurl libcurl-dev libcurl-doc" FILES_${PN} = "${bindir}/curl" |