Upgrade libxml2 version

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1598 311d38ba-8fff-0310-9ca6-ca027cbcb966

2 files changed, 32 insertions, 39 deletions

diff --git a/meta/packages/libxml/libxml2_2.6.22.bb b/meta/packages/libxml/libxml2_2.6.22.bb
deleted file mode 100644
index 82494fe75e..0000000000
--- a/meta/packages/libxml/libxml2_2.6.22.bb
+++ /dev/null
@@ -1,39 +0,0 @@
-PR = "r2"
-DESCRIPTION = "GNOME XML library"
-SECTION = "libs"
-PRIORITY = "optional"
-LICENSE = "MIT"
-PACKAGES = "${PN}-dbg ${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale"
-
-FILES_${PN}-dev += "${bindir}/xml-config"
-FILES_${PN}-utils += "${bindir}/*"
-
-SRC_URI = "http://xmlsoft.org/sources/libxml2/libxml2-${PV}.tar.gz \
-                   file://no-testapi.patch;patch=1"
-inherit autotools pkgconfig 
-
-EXTRA_OECONF = "--without-python --without-debug --without-legacy --without-catalog --without-docbook --without-c14n --without-schemas --without-schematron"
-
-headers = "DOCBparser.h HTMLparser.h HTMLtree.h SAX.h SAX2.h c14n.h catalog.h chvalid.h debugXML.h dict.h encoding.h entities.h globals.h hash.h list.h nanoftp.h nanohttp.h parser.h parserInternals.h pattern.h relaxng.h schemasInternals.h threads.h tree.h uri.h valid.h xinclude.h xlink.h xmlIO.h xmlautomata.h xmlerror.h xmlexports.h xmlmemory.h xmlreader.h xmlregexp.h xmlschemas.h xmlschemastypes.h xmlstring.h xmlunicode.h xmlversion.h xmlwriter.h xpath.h xpathInternals.h xpointer.h"
-
-do_stage () {
-        oe_libinstall -so libxml2 ${STAGING_LIBDIR}
-
-        mkdir -p ${STAGING_INCDIR}/libxml2/libxml
-        for i in ${headers}; do
-                install -m 0644 include/libxml/$i ${STAGING_INCDIR}/libxml2/libxml/$i
-        done
-
-        cat xml2-config | sed -e "s,^prefix=.*,prefix=${STAGING_BINDIR}/..," \
-                             -e "s,^exec_prefix=.*,exec_prefix=${STAGING_BINDIR}/..," \
-                             -e "s,^includedir=.*,includedir=${STAGING_INCDIR}," \
-                             -e "s,^libdir=.*,libdir=${STAGING_LIBDIR}," > ${STAGING_BINDIR_CROSS}/xml2-config
-        chmod a+rx ${STAGING_BINDIR_CROSS}/xml2-config
-        install -m 0644 libxml.m4 ${STAGING_DATADIR}/aclocal/
-}
-
-python populate_packages_prepend () {
-        # autonamer would call this libxml2-2, but we don't want that
-        if bb.data.getVar('DEBIAN_NAMES', d, 1):
-                bb.data.setVar('PKG_libxml2', 'libxml2', d)
-}
diff --git a/meta/packages/libxml/libxml2_2.6.26.bb b/meta/packages/libxml/libxml2_2.6.26.bb
new file mode 100644
index 0000000000..e330050b81
--- /dev/null
+++ b/meta/packages/libxml/libxml2_2.6.26.bb
@@ -0,0 +1,32 @@
+DESCRIPTION = "GNOME XML Parser library"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "MIT"
+PR = "r4"
+
+SRC_URI = "ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz \
+                file://no-testapi.patch;patch=1"
+
+inherit autotools pkgconfig binconfig
+
+EXTRA_OECONF = "--without-python --without-debug --without-legacy --without-catalog --without-docbook --with-c14n --without-schemas --without-schematron --with-reader"
+
+export LDFLAGS += "-ldl"
+
+do_stage() {
+        autotools_stage_all
+        install -m 0644 libxml.m4 ${STAGING_DATADIR}/aclocal/
+        #this is need it by php during its install
+        install -m 0755 xml2-config ${STAGING_BINDIR}
+}
+
+python populate_packages_prepend () {
+        # autonamer would call this libxml2-2, but we don't want that
+        if bb.data.getVar('DEBIAN_NAMES', d, 1):
+                bb.data.setVar('PKG_libxml2', 'libxml2', d)
+}
+
+PACKAGES = "${PN}-dbg ${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale"
+
+FILES_${PN}-dev += "${bindir}/*-config"
+FILES_${PN}-utils += "${bindir}/*"