Patchwork [V2,08/25] curl: inherit shlibpackaging class

login
register
mail settings
Submitter Saul Wold
Date July 13, 2011, 7:33 a.m.
Message ID <68f61d86cd90440d5a9433c3342fd3df9b05aa40.1310541680.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/7485/
State New, archived
Headers show

Comments

Saul Wold - July 13, 2011, 7:33 a.m.
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-support/curl/curl_7.21.7.bb |   17 ++++++-----------
 1 files changed, 6 insertions(+), 11 deletions(-)
Phil Blundell - July 13, 2011, 9:14 a.m.
I'm slightly confused about what's going on with the various subpackages
in these recipes now.

As far as I can tell, the current shlibpackaging.bbclass just does:

PACKAGES =+ "lib${PN}"
FILES_lib${PN} = "${libdir}/*${SOLIBS} ${base_libdir}/*${SOLIBS}"
RDEPENDS_lib${PN} = "${PN}"

i.e. it doesn't create a lib${PN}-dev or lib${PN}-doc package.  But:

On Wed, 2011-07-13 at 00:33 -0700, Saul Wold wrote:
> -PACKAGES += "${PN}-certs libcurl libcurl-dev libcurl-doc"
> +PACKAGES += "${PN}-certs"

[...]
 
> +FILES_lib${PN}-dev =+ "${libdir}/pkgconfig \
>                        ${datadir}/aclocal \
>                        ${bindir}/*-config"
>  
> -FILES_lib${PN}-doc = "${mandir}/man3 \
> -                      ${mandir}/man1/curl-config.1"
> +
> +FILES_lib${PN}-doc =+ "${mandir}/man1/curl-config.1"

... it seems that curl is still appending the FILES for those two even
though it isn't adding them to PACKAGES anymore.  Where do they come
from now, and where are the default FILES defined?

p.

Patch

diff --git a/meta/recipes-support/curl/curl_7.21.7.bb b/meta/recipes-support/curl/curl_7.21.7.bb
index 28344e2..fd8d358 100644
--- a/meta/recipes-support/curl/curl_7.21.7.bb
+++ b/meta/recipes-support/curl/curl_7.21.7.bb
@@ -8,7 +8,7 @@  LIC_FILES_CHKSUM = "file://COPYING;beginline=7;md5=3a34942f4ae3fbf1a303160714e66
 DEPENDS = "zlib gnutls"
 DEPENDS_virtclass-native = "zlib-native"
 DEPENDS_virtclass-nativesdk = "zlib-nativesdk"
-PR = "r0"
+PR = "r2"
 
 SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
            file://noldlibpath.patch \
@@ -17,7 +17,7 @@  SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
 SRC_URI[md5sum] = "5f6d50c4d4ee38c57fe37e3cff75adbd"
 SRC_URI[sha256sum] = "1a50dd17400c042090203eef347e946f29c342c32b6c4843c740c80975e8215a"
 
-inherit autotools pkgconfig binconfig
+inherit autotools pkgconfig binconfig shlibpackaging
 
 EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \
                 --without-ssl \
@@ -36,7 +36,7 @@  do_configure_prepend() {
 	sed -i s:OPT_GNUTLS/bin:OPT_GNUTLS:g configure.ac
 }
 
-PACKAGES += "${PN}-certs libcurl libcurl-dev libcurl-doc"
+PACKAGES += "${PN}-certs"
 
 FILES_${PN} = "${bindir}/curl"
 
@@ -45,17 +45,12 @@  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 \
+FILES_lib${PN}-dev =+ "${libdir}/pkgconfig \
                       ${datadir}/aclocal \
                       ${bindir}/*-config"
 
-FILES_lib${PN}-doc = "${mandir}/man3 \
-                      ${mandir}/man1/curl-config.1"
+
+FILES_lib${PN}-doc =+ "${mandir}/man1/curl-config.1"
 
 BBCLASSEXTEND = "native nativesdk"