[oe-commits] Denis 'GNUtoo' Carikli : libxml2 : convert to new staging and fix python error in gnome-doc-utils

[git version control]

Module: openembedded.git
Branch: shr/unstable
Commit: 405e0b5f60f92995fc722fc3bca9fa8ebc5f5f46
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=405e0b5f60f92995fc722fc3bca9fa8ebc5f5f46

Author: Denis 'GNUtoo' Carikli <GNUtoo at no-log.org>
Date:   Thu Feb 18 21:26:58 2010 +0100

libxml2 : convert to new staging and fix python error in gnome-doc-utils

Converting libxml2 recipes to the new staging way
  fixed the error where,during the compilation of gnome-doc-utils
  libxml2.py couldn't be find,but strangely the libxml package had
  only libxml.py

Also removed the following useless part as suggested by Phil Blundell
  on mailing list:
       install -d ${STAGING_DATADIR}/aclocal/
       install -d ${STAGING_BINDIR_CROSS}

---

 recipes/libxml/libxml2-native.inc      |    4 ++--
 recipes/libxml/libxml2-native_2.7.3.bb |    2 +-
 recipes/libxml/libxml2.inc             |    8 ++------
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/recipes/libxml/libxml2-native.inc b/recipes/libxml/libxml2-native.inc
index 3f67152..82d36b9 100644
--- a/recipes/libxml/libxml2-native.inc
+++ b/recipes/libxml/libxml2-native.inc
@@ -22,6 +22,6 @@ do_configure (){
 	autotools_do_configure ${EXTRA_LIBXML2_OECONF}
 }
 
-do_stage () {
-	oe_runmake install
+do_install_append() {
+	:
 }
diff --git a/recipes/libxml/libxml2-native_2.7.3.bb b/recipes/libxml/libxml2-native_2.7.3.bb
index 48e3598..bcbfb66 100644
--- a/recipes/libxml/libxml2-native_2.7.3.bb
+++ b/recipes/libxml/libxml2-native_2.7.3.bb
@@ -1,2 +1,2 @@
 require libxml2-native.inc
-PR = "r0"
+PR = "r1"
diff --git a/recipes/libxml/libxml2.inc b/recipes/libxml/libxml2.inc
index 101489e..b324228 100644
--- a/recipes/libxml/libxml2.inc
+++ b/recipes/libxml/libxml2.inc
@@ -5,7 +5,7 @@ LICENSE = "MIT"
 
 SRC_URI = "ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz"
 
-INC_PR = "r2"
+INC_PR = "r3"
 
 inherit autotools pkgconfig binconfig
 
@@ -13,11 +13,7 @@ EXTRA_OECONF = "--without-python --without-debug --without-legacy --with-catalog
 
 export LDFLAGS += "-ldl"
 
-do_stage() {
-	autotools_stage_all
-	install -d ${STAGING_DATADIR}/aclocal/
-	install -d ${STAGING_BINDIR_CROSS}
-
+do_install_append() {
  	install -m 0644 libxml.m4 ${STAGING_DATADIR}/aclocal/
 	#this is need it by php during its install
 	install -m 0755 xml2-config ${STAGING_BINDIR_CROSS}