try to fixup mesalib compile, it needs libxml2 python module

4 files changed, 37 insertions, 8 deletions

diff --git a/package/libxml2/Makefile b/package/libxml2/Makefile
index 301c6662d..624ffdb26 100644
--- a/package/libxml2/Makefile
+++ b/package/libxml2/Makefile
@@ -10,7 +10,7 @@ PKG_MD5SUM:=		9c0cfef285d5c4a5c80d00904ddab380
 PKG_DESCR:=		XML C parser and toolkit
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		zlib
-PKG_BUILDDEP:=		autotool libxml2-host zlib
+PKG_BUILDDEP:=		autotool gettext-tiny libxml2-host zlib
 PKG_URL:=		http://www.xmlsoft.org/
 PKG_SITES:=		http://xmlsoft.org/sources/
 PKG_OPTS:=		dev
@@ -19,6 +19,7 @@ PKG_SUBPKGS:=		LIBXML2 LIBXML2_PYTHON
 PKGSD_LIBXML2_PYTHON:=	XML python bindings
 PKGSC_LIBXML2_PYTHON:=	libs
 PKGSB_LIBXML2_PYTHON:=	python2
+PKGSS_LIBXML2_PYTHON:=	python2
 
 ifeq ($(ADK_STATIC),y)
 PKG_OPTS+=		libmix
@@ -34,7 +35,7 @@ $(eval $(call PKG_template,LIBXML2_PYTHON,libxml2-python,${PKG_VERSION}-${PKG_RE
 include $(TOPDIR)/mk/python.mk
 
 HOST_STYLE:=		auto
-HOST_CONFIGURE_ARGS+=	--without-python \
+HOST_CONFIGURE_ARGS+=	--with-python \
 			--without-iconv \
 			--without-lzma \
 			--without-zlib
diff --git a/package/libxml2/patches/patch-configure_in b/package/libxml2/patches/patch-configure_in
index a8340e906..6432ced20 100644
--- a/package/libxml2/patches/patch-configure_in
+++ b/package/libxml2/patches/patch-configure_in
@@ -1,5 +1,5 @@
 --- libxml2-2.9.1.orig/configure.in	2013-04-19 09:25:20.000000000 +0200
-+++ libxml2-2.9.1/configure.in	2013-10-31 08:37:36.000000000 +0100
++++ libxml2-2.9.1/configure.in	2013-11-23 23:02:06.000000000 +0100
 @@ -748,80 +748,16 @@ PYTHON_SITE_PACKAGES=
  PYTHON_TESTS=
  pythondir=
@@ -77,11 +77,11 @@
 -	    fi
 -	fi
 -    fi
-+    PYTHON_INCLUDES=`$PYTHON$PYTHON_VERSION-config --includes`
-+    PYTHON_LIBS=`$PYTHON$PYTHON_VERSION-config --ldflags`
-+    PYTHON_SITE_PACKAGES=/usr/lib/python$PYTHON_VERSION/site-packages
-     pythondir='$(PYTHON_SITE_PACKAGES)'
--    PYTHON_LIBS=`python$PYTHON_VERSION-config --ldflags`
+-    pythondir='$(PYTHON_SITE_PACKAGES)'
++    PYTHON_INCLUDES=`python$PYTHON_VERSION-config --includes`
+     PYTHON_LIBS=`python$PYTHON_VERSION-config --ldflags`
++    PYTHON_SITE_PACKAGES=${prefix}/lib/python$PYTHON_VERSION/site-packages
++    pythondir='$(PYTHON_SITE_PACKAGES)'
  else
      PYTHON=
  fi
diff --git a/package/libxml2/patches/patch-python_Makefile_am b/package/libxml2/patches/patch-python_Makefile_am
new file mode 100644
index 000000000..82061eee3
--- /dev/null
+++ b/package/libxml2/patches/patch-python_Makefile_am
@@ -0,0 +1,17 @@
+--- libxml2-2.9.1.orig/python/Makefile.am	2013-04-19 08:56:45.000000000 +0200
++++ libxml2-2.9.1/python/Makefile.am	2013-11-24 09:18:44.000000000 +0100
+@@ -19,12 +19,12 @@ if WITH_PYTHON
+ AM_CPPFLAGS = \
+ 	-I$(top_builddir)/include \
+ 	-I$(top_srcdir)/include	\
+-	-I$(PYTHON_INCLUDES)
++	$(PYTHON_INCLUDES)
+ 
+ python_LTLIBRARIES = libxml2mod.la
+ 
+ libxml2mod_la_SOURCES = libxml.c libxml_wrap.h libxml2-py.h libxml2-py.c types.c
+-libxml2mod_la_LDFLAGS = $(CYGWIN_EXTRA_LDFLAGS) $(WIN32_EXTRA_LDFLAGS) -module -avoid-version \
++libxml2mod_la_LDFLAGS = $(LDFLAGS) $(CYGWIN_EXTRA_LDFLAGS) $(WIN32_EXTRA_LDFLAGS) -module -avoid-version \
+         $(top_builddir)/libxml2.la $(CYGWIN_EXTRA_PYTHON_LIBADD) $(WIN32_EXTRA_PYTHON_LIBADD) $(PYTHON_LIBS)
+ 
+ BUILT_SOURCES = libxml2-export.c libxml2-py.h libxml2-py.c
diff --git a/package/libxml2/patches/patch-python_setup_py b/package/libxml2/patches/patch-python_setup_py
new file mode 100644
index 000000000..13ec3493d
--- /dev/null
+++ b/package/libxml2/patches/patch-python_setup_py
@@ -0,0 +1,11 @@
+--- libxml2-2.9.1.orig/python/setup.py	2013-04-19 09:36:20.000000000 +0200
++++ libxml2-2.9.1/python/setup.py	2013-11-21 18:47:16.000000000 +0100
+@@ -8,7 +8,7 @@ from distutils.core import setup, Extens
+ # Below ROOT, we expect to find include, include/libxml2, lib and bin.
+ # On *nix, it is not needed (but should not harm), 
+ # on Windows, it is set by configure.js.
+-ROOT = r'/usr' 
++ROOT = r'/Volumes/adk/openadk/host_i686_gnu_eglibc/usr' 
+ 
+ # Thread-enabled libxml2
+ with_threads = 1