distutils-base.bbclass: Move common functionality to distutils-common-base.bbclass

	Create a new class distutils-common-base.bbclass which holds the common
	parts that can be used in native and target packages which need to use
	distutils funtionality.

	rpm, libxml2, zope are currently using them and needed to use
	distutils-native-base for native recipes.

	rpm and libxml need to defer the processing of certain configure
	parameters which we evaluate using python. So we need to have python-native
	built before we can process them. Hence we can not use EXTRA_OECONF
	which is a python variable and gets expanded during parsing recipes
	and ofcourse we have not yet built python-native.

	We pass these extra options as a separate shell variable to do_configure
	which we evaluate when that task is executing.

1 files changed, 6 insertions, 2 deletions

diff --git a/recipes/libxml/libxml2-native.inc b/recipes/libxml/libxml2-native.inc
index c8182de91a..3f67152ca1 100644
--- a/recipes/libxml/libxml2-native.inc
+++ b/recipes/libxml/libxml2-native.inc
@@ -5,10 +5,10 @@ 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 distutils-base autotools native pkgconfig
+inherit autotools native pkgconfig distutils-native-base
 
 do_configure_prepend () {
-	EXTRA_OECONF = "\
+	EXTRA_LIBXML2_OECONF="\
 	--with-python=${PYTHON_DIR} \
 	--without-debug \
 	--without-legacy \
@@ -18,6 +18,10 @@ do_configure_prepend () {
 	"
 }
 
+do_configure (){
+	autotools_do_configure ${EXTRA_LIBXML2_OECONF}
+}
+
 do_stage () {
 	oe_runmake install
 }