diff options
| author |   Michael 'Mickey' Lauer <mickey@vanille-media.de> | 2008-12-10 19:04:54 +0100 |
|---|---|---|
| committer | Michael 'Mickey' Lauer <mickey@vanille-media.de> | 2008-12-10 19:05:17 +0100 |
| commit | 9cd6ac1c5cf557978ca796a1830cfc6e66dcfddb (patch) | |
| tree | 42e2a8e0fb9732beab347d3936e88b69846e653e /packages/libxml | |
| parent | 2ee2e37f6f5b39b731532f3abbaeb91d2a36cb7d (diff) | |
| download | openembedded-9cd6ac1c5cf557978ca796a1830cfc6e66dcfddb.tar.gz | |
libxml2: catch up with python 2.6; use distutils-base for gather the proper include dir
Diffstat (limited to 'packages/libxml')
| -rw-r--r-- | packages/libxml/libxml2-native.inc | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/packages/libxml/libxml2-native.inc b/packages/libxml/libxml2-native.inc index 5672792db3..603f48d196 100644 --- a/packages/libxml/libxml2-native.inc +++ b/packages/libxml/libxml2-native.inc @@ -6,18 +6,16 @@ PR = "r3" SRC_URI = "ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz" S = "${WORKDIR}/libxml2-${PV}" -inherit autotools native pkgconfig +inherit distutils-base autotools native pkgconfig -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" +EXTRA_OECONF = "\ + --with-python=${STAGING_INCDIR}/${PYTHON_MAJMIN} \ + --without-debug \ + --without-legacy \ + --without-catalog \ + --without-docbook \ + --with-c14n \ +" do_stage () { oe_runmake install |