From 5c69bdef4ca0d8413477db32cc82b82395806504 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Tue, 7 Apr 2009 13:24:55 +0000 Subject: curl: move PACKAGES and FILES_* from the .inc file this resolves the lockfile() trying to access the wrong directory when building sdk version after target one was built Signed-off-by: Denys Dmytriyenko Acked-by: Tom Rini --- recipes/curl/curl-common.inc | 57 +++++++++++++++++++++++++++ recipes/curl/curl-native_7.18.2.bb | 4 +- recipes/curl/curl-sdk_7.18.2.bb | 4 +- recipes/curl/curl-target.inc | 22 +++++++++++ recipes/curl/curl.inc | 80 -------------------------------------- recipes/curl/curl_7.18.2.bb | 4 +- recipes/curl/curl_7.19.0.bb | 6 +-- 7 files changed, 89 insertions(+), 88 deletions(-) create mode 100644 recipes/curl/curl-common.inc create mode 100644 recipes/curl/curl-target.inc delete mode 100644 recipes/curl/curl.inc (limited to 'recipes/curl') diff --git a/recipes/curl/curl-common.inc b/recipes/curl/curl-common.inc new file mode 100644 index 0000000000..ce4f5f2a8e --- /dev/null +++ b/recipes/curl/curl-common.inc @@ -0,0 +1,57 @@ +DESCRIPTION = "Command line tool and library for client-side URL transfers." +LICENSE = "MIT" +SECTION = "console/network" + +SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ + file://pkgconfig_fix.patch;patch=1" +S = "${WORKDIR}/curl-${PV}" + +CURL_FEATURES ?= "zlib,gnutls,cookies,crypto-auth,dict,file,ftp,http,telnet,tftp" +# other allowed features: ipv6, ares + +inherit autotools pkgconfig binconfig + +EXTRA_OECONF = " \ + --without-libssh2 \ + --with-random=/dev/urandom \ + --without-libidn \ + --without-ssl \ + " + +python __anonymous() { + f = bb.data.getVar("CURL_FEATURES", d, True).split(",") + oeconf = bb.data.getVar("EXTRA_OECONF", d, False) + deps = bb.data.getVar("DEPENDS", d, False).split() + for x in [ 'cookies', 'crypto-auth', 'dict', 'file', 'ftp', 'http', 'telnet', 'tftp', 'ipv6' ]: + if x in f: + oeconf += " --enable-%s" % x + else: + oeconf += " --disable-%s" % x + if 'zlib' in f: + oeconf += " --with-zlib=${STAGING_LIBDIR}/../" + deps.append("zlib") + else: + oeconf += " --without-zlib" + if 'gnutls' in f: + oeconf += " --with-gnutls=${STAGING_BINDIR_CROSS}" + deps.append("gnutls") + else: + oeconf += " --without-gnutls" + if 'ares' in f: + oeconf += " --enable-ares" + deps.append("c-ares") + else: + oeconf += " --disable-ares" + bb.data.setVar('EXTRA_OECONF', oeconf, d) + bb.data.setVar('DEPENDS', " ".join(deps), d) +} + +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} +} diff --git a/recipes/curl/curl-native_7.18.2.bb b/recipes/curl/curl-native_7.18.2.bb index f0e2b8940e..c95591b70b 100644 --- a/recipes/curl/curl-native_7.18.2.bb +++ b/recipes/curl/curl-native_7.18.2.bb @@ -1,6 +1,7 @@ -require curl_${PV}.bb +require curl-common.inc inherit native DEPENDS = "zlib-native" +PR = "r1" do_stage () { autotools_stage_all @@ -9,4 +10,3 @@ do_stage () { do_install() { : } - diff --git a/recipes/curl/curl-sdk_7.18.2.bb b/recipes/curl/curl-sdk_7.18.2.bb index 816fe645bc..35b0d8883f 100644 --- a/recipes/curl/curl-sdk_7.18.2.bb +++ b/recipes/curl/curl-sdk_7.18.2.bb @@ -1,6 +1,7 @@ -require curl_${PV}.bb +require curl-common.inc inherit sdk DEPENDS = "zlib-sdk" +PR = "r1" do_stage () { install -d ${STAGING_INCDIR}/curl @@ -11,4 +12,3 @@ do_stage () { do_install() { : } - diff --git a/recipes/curl/curl-target.inc b/recipes/curl/curl-target.inc new file mode 100644 index 0000000000..88877e51a0 --- /dev/null +++ b/recipes/curl/curl-target.inc @@ -0,0 +1,22 @@ +PACKAGES += "${PN}-certs libcurl libcurl-dev libcurl-doc" + +FILES_${PN} = "${bindir}/curl" + +FILES_${PN}-certs = "${datadir}/curl/curl-*" +PACKAGE_ARCH_${PN}-certs = "all" + +FILES_${PN}-doc = "${mandir}/man1/curl.1" + +FILES_lib${PN} = "${libdir}/lib*.so.*" +RRECOMMENDS_lib${PN} += "${PN}-certs" +FILES_lib${PN}-dev = "${includedir} \ + ${libdir}/lib*.so \ + ${libdir}/lib*.a \ + ${libdir}/lib*.la \ + ${libdir}/pkgconfig \ + ${datadir}/aclocal \ + ${bindir}/*-config" + +FILES_lib${PN}-doc = "${mandir}/man3 \ + ${mandir}/man1/curl-config.1" + diff --git a/recipes/curl/curl.inc b/recipes/curl/curl.inc deleted file mode 100644 index d3edaef20a..0000000000 --- a/recipes/curl/curl.inc +++ /dev/null @@ -1,80 +0,0 @@ -DESCRIPTION = "Command line tool and library for client-side URL transfers." -LICENSE = "MIT" -SECTION = "console/network" - -SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ - file://pkgconfig_fix.patch;patch=1" -S = "${WORKDIR}/curl-${PV}" - -CURL_FEATURES ?= "zlib,gnutls,cookies,crypto-auth,dict,file,ftp,http,telnet,tftp" -# other allowed features: ipv6, ares - -inherit autotools pkgconfig binconfig - -EXTRA_OECONF = " \ - --without-libssh2 \ - --with-random=/dev/urandom \ - --without-libidn \ - --without-ssl \ - " - -python __anonymous() { - f = bb.data.getVar("CURL_FEATURES", d, True).split(",") - oeconf = bb.data.getVar("EXTRA_OECONF", d, False) - deps = bb.data.getVar("DEPENDS", d, False).split() - for x in [ 'cookies', 'crypto-auth', 'dict', 'file', 'ftp', 'http', 'telnet', 'tftp', 'ipv6' ]: - if x in f: - oeconf += " --enable-%s" % x - else: - oeconf += " --disable-%s" % x - if 'zlib' in f: - oeconf += " --with-zlib=${STAGING_LIBDIR}/../" - deps.append("zlib") - else: - oeconf += " --without-zlib" - if 'gnutls' in f: - oeconf += " --with-gnutls=${STAGING_BINDIR_CROSS}" - deps.append("gnutls") - else: - oeconf += " --without-gnutls" - if 'ares' in f: - oeconf += " --enable-ares" - deps.append("c-ares") - else: - oeconf += " --disable-ares" - bb.data.setVar('EXTRA_OECONF', oeconf, d) - bb.data.setVar('DEPENDS', " ".join(deps), d) -} - -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" - -FILES_${PN}-certs = "${datadir}/curl/curl-*" -PACKAGE_ARCH_${PN}-certs = "all" - -FILES_${PN}-doc = "${mandir}/man1/curl.1" - -FILES_lib${PN} = "${libdir}/lib*.so.*" -RRECOMMENDS_lib${PN} += "${PN}-certs" -FILES_lib${PN}-dev = "${includedir} \ - ${libdir}/lib*.so \ - ${libdir}/lib*.a \ - ${libdir}/lib*.la \ - ${libdir}/pkgconfig \ - ${datadir}/aclocal \ - ${bindir}/*-config" - -FILES_lib${PN}-doc = "${mandir}/man3 \ - ${mandir}/man1/curl-config.1" - diff --git a/recipes/curl/curl_7.18.2.bb b/recipes/curl/curl_7.18.2.bb index 2c3ec415f5..3de6da4fec 100644 --- a/recipes/curl/curl_7.18.2.bb +++ b/recipes/curl/curl_7.18.2.bb @@ -1,2 +1,4 @@ -require curl.inc +require curl-common.inc +require curl-target.inc +PR = "r1" diff --git a/recipes/curl/curl_7.19.0.bb b/recipes/curl/curl_7.19.0.bb index a99a68bcb1..1944efe240 100644 --- a/recipes/curl/curl_7.19.0.bb +++ b/recipes/curl/curl_7.19.0.bb @@ -1,5 +1,5 @@ -require curl.inc +require curl-common.inc +require curl-target.inc SRC_URI += "file://off_t_abi_fix.patch;patch=1;pnum=0" -PR = "r1" - +PR = "r2" -- cgit 1.2.3-korg