Merge oe-devel@oe-devel.bkbits.net:packages

[openembedded.git] / libxml / libxml2_2.6.7.oe

diff --git a/libxml/libxml2_2.6.7.oe b/libxml/libxml2_2.6.7.oe
index 03b9b36..b50f0ca 100644 (file)
--- a/libxml/libxml2_2.6.7.oe
+++ b/libxml/libxml2_2.6.7.oe
@@ -1,25 +1,40 @@
+PR = "r1"
 DESCRIPTION = "GNOME XML library"
 SECTION = "libs"
 PRIORITY = "optional"
-DEPENDS = "virtual/libc"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 
-SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/libxml2/2.6/libxml2-${PV}.tar.bz2"
+PACKAGES = "${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale"
 
-inherit autotools pkgconfig libtool
+FILES_${PN}-dev += "${bindir}/xml-config"
+FILES_${PN}-utils += "${bindir}"
 
-EXTRA_OECONF = "--without-python"
+SRC_URI = "http://xmlsoft.org/sources/libxml2-${PV}.tar.gz"
+
+inherit autotools pkgconfig 
+
+EXTRA_OECONF = "--without-python --without-debug --without-legacy --without-schemas --without-catalog --without-docbook --without-c14n"
 
-libname = "libxml2.so.2.6.7"
 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_soinstall .libs/${libname} ${STAGING_LIBDIR}/
-       install -m 0644 .libs/libxml2.lai ${STAGING_LIBDIR}/libxml2.la
-       install -m 0644 .libs/libxml2.a ${STAGING_LIBDIR}/
+       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}/xml2-config
+       chmod a+rx ${STAGING_BINDIR}/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 oe.data.getVar('DEBIAN_NAMES', d, 1):
+               oe.data.setVar('PKG_libxml2', 'libxml2', d)
 }