diff options
| author |   Hongxu Jia <hongxu.jia@windriver.com> | 2014-12-23 13:09:54 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-12-24 17:48:57 +0000 |
| commit | 06f555fa5a36dbf63b26c3734dbbd0b5af16dc33 (patch) | |
| tree | 2d9fb2247001682447da1ba2f36a3f47b0c456ff /meta/recipes-core/libxml/libxml2.inc | |
| parent | 346a023a42f127881476e760e8fa4e04303849b9 (diff) | |
| download | openembedded-core-contrib-06f555fa5a36dbf63b26c3734dbbd0b5af16dc33.tar.gz | |
libxml2: upgrade to 2.9.2
- Rebase python-sitepackages-dir.patch to 2.9.2
- Drop libxml2-CVE-2014-3660.patch which has been merged to 2.9.2.
- Add configure.ac-fix-cross-compiling-warning.patch to fix cross
compilation failure.
- Tweak do_configure_prepend, use configure.ac to instead of configure.in
- Add cmake files to ${PN}-dev
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/libxml/libxml2.inc')
| -rw-r--r-- | meta/recipes-core/libxml/libxml2.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-core/libxml/libxml2.inc b/meta/recipes-core/libxml/libxml2.inc index c729c199cf..1314bbfb8d 100644 --- a/meta/recipes-core/libxml/libxml2.inc +++ b/meta/recipes-core/libxml/libxml2.inc @@ -21,7 +21,7 @@ SRC_URI = "ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz;name=libtar \ file://libxml2-CVE-2014-0191-fix.patch \ file://python-sitepackages-dir.patch \ file://libxml-m4-use-pkgconfig.patch \ - file://libxml2-CVE-2014-3660.patch \ + file://configure.ac-fix-cross-compiling-warning.patch \ " BINCONFIG = "${bindir}/xml2-config" @@ -34,7 +34,7 @@ RDEPENDS_${PN}-ptest_append_libc-glibc += "glibc-gconv-ebcdic-us glibc-gconv-ibm # We don't DEPEND on binutils for ansidecl.h so ensure we don't use the header do_configure_prepend () { - sed -i -e '/.*ansidecl.h.*/d' ${S}/configure.in + sed -i -e '/.*ansidecl.h.*/d' ${S}/configure.ac } do_configure_prepend_class-nativesdk () { @@ -66,7 +66,7 @@ PACKAGES += "${PN}-utils ${PN}-python" FILES_${PN}-dbg += "${PYTHON_SITEPACKAGES_DIR}/.debug" FILES_${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/*.a" -FILES_${PN}-dev += "${libdir}/xml2Conf.sh" +FILES_${PN}-dev += "${libdir}/xml2Conf.sh ${libdir}/cmake/*" FILES_${PN}-utils += "${bindir}/*" FILES_${PN}-python += "${PYTHON_SITEPACKAGES_DIR}" |