From 22c85055348c01f86dffbe926a0eccf8fac3b1f9 Mon Sep 17 00:00:00 2001
From: Ross Burton <ross@openedhand.com>
Date: Thu, 2 Aug 2007 11:30:51 +0000
Subject: Upgrade libxml/libxslt

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2328 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 meta/packages/libxml/libxml2_2.6.26.bb  | 32 -----------------------
 meta/packages/libxml/libxml2_2.6.27.bb  | 32 +++++++++++++++++++++++
 meta/packages/libxslt/libxslt_1.1.17.bb | 46 ---------------------------------
 meta/packages/libxslt/libxslt_1.1.20.bb | 44 +++++++++++++++++++++++++++++++
 4 files changed, 76 insertions(+), 78 deletions(-)
 delete mode 100644 meta/packages/libxml/libxml2_2.6.26.bb
 create mode 100644 meta/packages/libxml/libxml2_2.6.27.bb
 delete mode 100644 meta/packages/libxslt/libxslt_1.1.17.bb
 create mode 100644 meta/packages/libxslt/libxslt_1.1.20.bb

diff --git a/meta/packages/libxml/libxml2_2.6.26.bb b/meta/packages/libxml/libxml2_2.6.26.bb
deleted file mode 100644
index e330050b8..000000000
--- a/meta/packages/libxml/libxml2_2.6.26.bb
+++ /dev/null
@@ -1,32 +0,0 @@
-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}/*"
diff --git a/meta/packages/libxml/libxml2_2.6.27.bb b/meta/packages/libxml/libxml2_2.6.27.bb
new file mode 100644
index 000000000..e330050b8
--- /dev/null
+++ b/meta/packages/libxml/libxml2_2.6.27.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}/*"
diff --git a/meta/packages/libxslt/libxslt_1.1.17.bb b/meta/packages/libxslt/libxslt_1.1.17.bb
deleted file mode 100644
index 7abd2c30b..000000000
--- a/meta/packages/libxslt/libxslt_1.1.17.bb
+++ /dev/null
@@ -1,46 +0,0 @@
-DESCRIPTION = "GNOME XSLT library"
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "libxml2"
-LICENSE = "MIT"
-PR = "r2"
-
-SRC_URI = "ftp://xmlsoft.org/libxml2/libxslt-${PV}.tar.gz \
-           file://destdir.patch;patch=1"
-S = "${WORKDIR}/libxslt-${PV}"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--without-python --without-debug --without-mem-debug --without-crypto"
-
-xsltheaders = "attributes.h documents.h extensions.h extra.h functions.h imports.h \
-               keys.h namespaces.h numbersInternals.h pattern.h preproc.h security.h \
-               templates.h transform.h variables.h xslt.h xsltInternals.h xsltconfig.h \
-               xsltexports.h xsltutils.h"
-exsltheaders = "exslt.h exsltconfig.h exsltexports.h"
-
-do_stage () {
-	oe_libinstall -C libxslt -so -a libxslt ${STAGING_LIBDIR}
-	oe_libinstall -C libexslt -so -a libexslt ${STAGING_LIBDIR}
-
-	mkdir -p ${STAGING_INCDIR}/libxslt
-	for i in ${xsltheaders}; do
-		install -m 0644 ${S}/libxslt/$i ${STAGING_INCDIR}/libxslt/$i
-	done
-	mkdir -p ${STAGING_INCDIR}/libexslt
-	for i in ${exsltheaders}; do
-		install -m 0644 ${S}/libexslt/$i ${STAGING_INCDIR}/libexslt/$i
-	done
-
-	cat xslt-config | sed -e "s,^prefix=.*,prefix=${STAGING_DIR}/${HOST_SYS}," \
-		       	     -e "s,^exec_prefix=.*,exec_prefix=${STAGING_DIR}/${HOST_SYS}," \
-			     -e "s,^includedir=.*,includedir=${STAGING_INCDIR}," \
-			     -e "s,^libdir=.*,libdir=${STAGING_LIBDIR}," > ${STAGING_BINDIR_CROSS}/xslt-config
-	chmod a+rx ${STAGING_BINDIR_CROSS}/xslt-config
-	install -m 0644 libxslt.m4 ${STAGING_DATADIR}/aclocal/
-}
-
-PACKAGES = "${PN}-dbg ${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale"
-
-FILES_${PN}-dev += "${bindir}/xslt-config"
-FILES_${PN}-utils += "${bindir}"
diff --git a/meta/packages/libxslt/libxslt_1.1.20.bb b/meta/packages/libxslt/libxslt_1.1.20.bb
new file mode 100644
index 000000000..fa063142b
--- /dev/null
+++ b/meta/packages/libxslt/libxslt_1.1.20.bb
@@ -0,0 +1,44 @@
+DESCRIPTION = "GNOME XSLT library"
+SECTION = "libs"
+PRIORITY = "optional"
+DEPENDS = "libxml2"
+LICENSE = "MIT"
+
+SRC_URI = "ftp://xmlsoft.org/libxml2/${PN}-${PV}.tar.gz"
+S = "${WORKDIR}/${PN}-${PV}"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--without-python --without-debug --without-mem-debug --without-crypto"
+
+xsltheaders = "attributes.h documents.h extensions.h extra.h functions.h imports.h \
+               keys.h namespaces.h numbersInternals.h pattern.h preproc.h security.h \
+               templates.h transform.h variables.h xslt.h xsltInternals.h xsltconfig.h \
+               xsltexports.h xsltutils.h"
+exsltheaders = "exslt.h exsltconfig.h exsltexports.h"
+
+do_stage () {
+	oe_libinstall -C libxslt -so -a libxslt ${STAGING_LIBDIR}
+	oe_libinstall -C libexslt -so -a libexslt ${STAGING_LIBDIR}
+
+	mkdir -p ${STAGING_INCDIR}/libxslt
+	for i in ${xsltheaders}; do
+		install -m 0644 ${S}/libxslt/$i ${STAGING_INCDIR}/libxslt/$i
+	done
+	mkdir -p ${STAGING_INCDIR}/libexslt
+	for i in ${exsltheaders}; do
+		install -m 0644 ${S}/libexslt/$i ${STAGING_INCDIR}/libexslt/$i
+	done
+
+	cat xslt-config | sed -e "s,^prefix=.*,prefix=${STAGING_DIR}/${HOST_SYS}," \
+		       	     -e "s,^exec_prefix=.*,exec_prefix=${STAGING_DIR}/${HOST_SYS}," \
+			     -e "s,^includedir=.*,includedir=${STAGING_INCDIR}," \
+			     -e "s,^libdir=.*,libdir=${STAGING_LIBDIR}," > ${STAGING_BINDIR_CROSS}/xslt-config
+	chmod a+rx ${STAGING_BINDIR_CROSS}/xslt-config
+	install -m 0644 libxslt.m4 ${STAGING_DATADIR}/aclocal/
+}
+
+PACKAGES = "${PN}-dbg ${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale"
+
+FILES_${PN}-dev += "${bindir}/xslt-config"
+FILES_${PN}-utils += "${bindir}"
-- 
cgit v1.2.3