[oe-commits] org.oe.dev libxml2-native: catch up with python2.5 update

[mickeyl commit]

libxml2-native: catch up with python2.5 update

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 33469de643b1cad4022de73b7ce97d808320e465
ViewMTN: http://monotone.openembedded.org/revision.psp?id=33469de643b1cad4022de73b7ce97d808320e465
Files:
1
packages/libxml/libxml2-native_2.6.10.bb
packages/libxml/libxml2-native_2.6.26.bb
packages/libxml/libxml2-native_2.6.9.bb
packages/libxml/libxml2_2.6.22.bb
packages/libxml/libxml2_2.6.26.bb
packages/libxml/libxml2-native_2.6.29.bb
Diffs:

#
# mt diff -r31473cedcc35446ce4e2e72c3e215e70dba7d2b4 -r33469de643b1cad4022de73b7ce97d808320e465
#
# 
# 
# delete "packages/libxml/libxml2-native_2.6.10.bb"
# 
# delete "packages/libxml/libxml2-native_2.6.26.bb"
# 
# delete "packages/libxml/libxml2-native_2.6.9.bb"
# 
# delete "packages/libxml/libxml2_2.6.22.bb"
# 
# delete "packages/libxml/libxml2_2.6.26.bb"
# 
# patch "packages/libxml/libxml2-native_2.6.29.bb"
#  from [a076be1d91dc524628f265be229c0bd8108a0a6a]
#    to [0b126ddc4ebc9a5029e2d23e95faa5baa2c4b05b]
# 
============================================================
--- packages/libxml/libxml2-native_2.6.29.bb	a076be1d91dc524628f265be229c0bd8108a0a6a
+++ packages/libxml/libxml2-native_2.6.29.bb	0b126ddc4ebc9a5029e2d23e95faa5baa2c4b05b
@@ -1,17 +1,24 @@ DESCRIPTION = "GNOME XML library"
 DESCRIPTION = "GNOME XML library"
-PR = "r1"
-
-SRC_URI = "ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz"
-
 DEPENDS = "python-native"
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libxml2-${PV}"
+PR = "r3"
 
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libxml2-${PV}"
+SRC_URI = "ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz"
 S = "${WORKDIR}/libxml2-${PV}"
 
 inherit autotools native pkgconfig
 
-EXTRA_OECONF = "--with-python=${STAGING_INCDIR}/python2.4 --without-debug --without-legacy --without-catalog --without-docbook --with-c14n"
+def libxml2_native_python_dir(d):
+        import os, bb
+        staging_incdir = bb.data.getVar( "STAGING_INCDIR", d, 1 )
+        if os.path.exists( "%s/python2.5" % staging_incdir ): return "python2.5"
+        if os.path.exists( "%s/python2.4" % staging_incdir ): return "python2.4"
+        if os.path.exists( "%s/python2.3" % staging_incdir ): return "python2.3"
+        raise "No Python in STAGING_INCDIR. Forgot to build python-native ?"
 
+EXTRA_OECONF = "--with-python=${STAGING_INCDIR}/${@libxml2_native_python_dir(d)} \
+                --without-debug --without-legacy --without-catalog --without-docbook --with-c14n"
+
 do_stage () {
 	oe_runmake install
 }