From cf64ca8e62ed3a8efc23cf2d49cd54954fe8d81c Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 15 Oct 2011 17:58:20 +0200
Subject: add package virtinst and dependencies

---
 package/libxml2/Makefile                | 20 +++++++++++++++++---
 package/libxml2/patches/patch-configure | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 3 deletions(-)
 create mode 100644 package/libxml2/patches/patch-configure

(limited to 'package/libxml2')

diff --git a/package/libxml2/Makefile b/package/libxml2/Makefile
index 8bfe1bb20..cae954797 100644
--- a/package/libxml2/Makefile
+++ b/package/libxml2/Makefile
@@ -14,20 +14,30 @@ PKG_BUILDDEP:=		zlib
 PKG_URL:=		http://www.xmlsoft.org/
 PKG_SITES:=		http://xmlsoft.org/sources/
 
-PKG_SUBPKGS:=		LIBXML2 LIBXML2_DEV
+PKG_SUBPKGS:=		LIBXML2 LIBXML2_DEV LIBXML2_PYTHON
 PKGSD_LIBXML2_DEV:=	XML parser headers
 PKGSC_LIBXML2_DEV:=	devel
+PKGSD_LIBXML2_PYTHON:=	XML python bindings
+PKGSC_LIBXML2_PYTHON:=	libs
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBXML2,libxml2,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,LIBXML2_DEV,libxml2-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXML2_DEV},${PKGSC_LIBXML2_DEV}))
+$(eval $(call PKG_template,LIBXML2_PYTHON,libxml2-python,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXML2_PYTHON},${PKGSC_LIBXML2_PYTHON}))
+
+include $(TOPDIR)/mk/python.mk
 
 TARGET_CFLAGS:=		$(filter-out -flto,$(TARGET_CFLAGS))
+ifeq ($(ADK_PACKAGE_LIBXML2_PYTHON),y)
+CONFIGURE_ARGS+=	--with-python=${STAGING_DIR}/usr
+else
+CONFIGURE_ARGS+=	--without-python
+endif
 CONFIGURE_ARGS+=	--without-c14n \
-			--without-catalog \
 			--without-debug \
 			--without-docbook \
+			--with-catalog \
 			--with-html \
 			--without-ftp \
 			--without-http \
@@ -37,7 +47,6 @@ CONFIGURE_ARGS+=	--without-c14n \
 			--with-output \
 			--without-pattern \
 			--without-push \
-			--without-python \
 			--with-reader \
 			--without-readline \
 			--without-regexps \
@@ -66,4 +75,9 @@ libxml2-dev-install:
 	${INSTALL_BIN} ${WRKINST}/usr/bin/xml2-config \
 		${IDIR_LIBXML2_DEV}/usr/bin
 
+libxml2-python-install:
+	$(INSTALL_DIR) $(IDIR_LIBXML2_PYTHON)/usr/lib/python$(PYTHON_VERSION)/site-packages
+	$(CP) $(WRKINST)/usr/lib/python$(PYTHON_VERSION)/site-packages/* \
+		$(IDIR_LIBXML2_PYTHON)/usr/lib/python$(PYTHON_VERSION)/site-packages
+	
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libxml2/patches/patch-configure b/package/libxml2/patches/patch-configure
new file mode 100644
index 000000000..f5a2ba355
--- /dev/null
+++ b/package/libxml2/patches/patch-configure
@@ -0,0 +1,33 @@
+--- libxml2-2.7.8.orig/configure	2010-11-04 18:28:14.000000000 +0100
++++ libxml2-2.7.8/configure	2011-10-15 15:07:16.000000000 +0200
+@@ -13423,17 +13423,17 @@ case ${host} in
+ esac
+ 
+ 
+-
++set -x
+ PYTHON_VERSION=
+ PYTHON_INCLUDES=
+ PYTHON_SITE_PACKAGES=
+ PYTHON_TESTS=
+ pythondir=
+ if test "$with_python" != "no" ; then
+-    if test -x "$with_python/bin/python"
++    if test -x "$with_python/bin/hostpython"
+     then
+-        echo Found python in $with_python/bin/python
+-        PYTHON="$with_python/bin/python"
++        echo Found python in $with_python/bin/hostpython
++        PYTHON="$with_python/bin/hostpython"
+     else
+         if test -x "$with_python/python.exe"
+         then
+@@ -13558,7 +13558,7 @@ else
+     PYTHON_SUBDIR=
+ fi
+ 
+-
++set +x
+ 
+ 
+ WITH_MODULES=0
-- 
cgit v1.2.3