summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorDmitry Eremin-Solenikov <dbaryshkov@gmail.com>2011-09-21 22:40:00 +0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-09-22 05:12:31 +0100
commitff8f0ea563ba3e9d6f8b8e770cfbf4dca8ad5288 (patch)
tree6b755b9c2e8e896bde34a1a6ea2bcd07d5547f50 /meta
parent2da22470c8a3f0572c5a13a16ab1bf1a37b95b71 (diff)
downloadpoky-ff8f0ea563ba3e9d6f8b8e770cfbf4dca8ad5288.tar.gz
libxml2: reinclude a -staticdev package
libxml2 provides a libxml2.a library, which wasn't included in any of the packages. Usually static libs are included into a -staticdev package, but this package wasn't generated for libxml2, due to libxml2.inc redeclaring PACKAGES variable (to include libxml2-utils). Replace PACKAGES setting with expansion to include all default packages (and so -staticdev package with libxml2.a). (From OE-Core rev: 76052861cc95fd4ad4c4b9eb6ce4cd1065ad4dc9) Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/libxml/libxml2.inc2
-rw-r--r--meta/recipes-core/libxml/libxml2_2.7.8.bb2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-core/libxml/libxml2.inc b/meta/recipes-core/libxml/libxml2.inc
index cf789b27ce..6f79333b91 100644
--- a/meta/recipes-core/libxml/libxml2.inc
+++ b/meta/recipes-core/libxml/libxml2.inc
@@ -37,7 +37,7 @@ python populate_packages_prepend () {
37 bb.data.setVar('PKG_libxml2', '${MLPREFIX}libxml2', d) 37 bb.data.setVar('PKG_libxml2', '${MLPREFIX}libxml2', d)
38} 38}
39 39
40PACKAGES = "${PN}-dbg ${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale" 40PACKAGES += "${PN}-utils"
41 41
42FILES_${PN}-dev += "${bindir}/*-config ${libdir}/xml2Conf.sh" 42FILES_${PN}-dev += "${bindir}/*-config ${libdir}/xml2Conf.sh"
43FILES_${PN}-utils += "${bindir}/*" 43FILES_${PN}-utils += "${bindir}/*"
diff --git a/meta/recipes-core/libxml/libxml2_2.7.8.bb b/meta/recipes-core/libxml/libxml2_2.7.8.bb
index 3909839d46..74860af8ec 100644
--- a/meta/recipes-core/libxml/libxml2_2.7.8.bb
+++ b/meta/recipes-core/libxml/libxml2_2.7.8.bb
@@ -1,6 +1,6 @@
1require libxml2.inc 1require libxml2.inc
2 2
3PR = "r1" 3PR = "r2"
4 4
5SRC_URI[md5sum] = "8127a65e8c3b08856093099b52599c86" 5SRC_URI[md5sum] = "8127a65e8c3b08856093099b52599c86"
6SRC_URI[sha256sum] = "cda23bc9ebd26474ca8f3d67e7d1c4a1f1e7106364b690d822e009fdc3c417ec" 6SRC_URI[sha256sum] = "cda23bc9ebd26474ca8f3d67e7d1c4a1f1e7106364b690d822e009fdc3c417ec"