package/mesa3d: Remove dependency for the libxml2 module of host-python

Remove the ugly BR2_PACKAGE_HOST_LIBXML2_PYTHON hack as well as
mesa3d was the only package needing it, this is not the case
anymore since:

http://cgit.freedesktop.org/mesa/mesa/commit/configure.ac?id=2de70fe23f320ce4f559e37057fe07b7af99cf5a

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/package/libxml2/Config.in b/package/libxml2/Config.in
index 85694f9751cf4389838b86ae2fbf5be241420a59..ebd63fe54cf46839f6ca5582699b249783aca538 100644 (file)
--- a/package/libxml2/Config.in
+++ b/package/libxml2/Config.in
@@ -4,6 +4,3 @@ config BR2_PACKAGE_LIBXML2
          XML C Parser
 
          http://xmlsoft.org/
-
-config BR2_PACKAGE_HOST_LIBXML2_PYTHON
-       bool

diff --git a/package/libxml2/libxml2-python2.patch b/package/libxml2/libxml2-python2.patch
deleted file mode 100644 (file)
index 19195a6..0000000
--- a/package/libxml2/libxml2-python2.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Prefer python2 binary in case python points to python3
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
-
-diff -uNr libxml2-2.9.1.org/configure.in libxml2-2.9.1/configure.in
---- libxml2-2.9.1.org/configure.in     2013-04-19 09:25:20.000000000 +0200
-+++ libxml2-2.9.1/configure.in 2014-04-12 14:16:26.579361068 +0200
-@@ -748,6 +748,11 @@
- PYTHON_TESTS=
- pythondir=
- if test "$with_python" != "no" ; then
-+    if test -x "$with_python/bin/python2"
-+    then
-+        echo Found python2 in $with_python/bin/python2
-+        PYTHON="$with_python/bin/python2"
-+    else
-     if test -x "$with_python/bin/python"
-     then
-         echo Found python in $with_python/bin/python
-@@ -773,6 +778,7 @@
-           fi
-       fi
-     fi
-+    fi
-     if test "$PYTHON" != ""
-     then
-         PYTHON_VERSION=`$PYTHON -c "from distutils import sysconfig; print(sysconfig.get_python_version())"`

diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk
index 62f3e2701a9aeef83ca2fd26a073654e0012b325..9bf4c280c5156f2475fb8fa10f1d0fc335aa03aa 100644 (file)
--- a/package/libxml2/libxml2.mk
+++ b/package/libxml2/libxml2.mk
@@ -20,21 +20,7 @@ LIBXML2_CONF_OPT = --with-gnu-ld --without-python --without-debug --without-lzma
 
 HOST_LIBXML2_DEPENDENCIES = host-pkgconf
 
-HOST_LIBXML2_CONF_OPT = --without-zlib --without-lzma
-
-# mesa3d uses functions that are only available with debug
-ifeq ($(BR2_PACKAGE_MESA3D),y)
-HOST_LIBXML2_CONF_OPT += --with-debug
-else
-HOST_LIBXML2_CONF_OPT += --without-debug
-endif
-
-ifeq ($(BR2_PACKAGE_HOST_LIBXML2_PYTHON),y)
-HOST_LIBXML2_DEPENDENCIES += host-python
-HOST_LIBXML2_CONF_OPT += --with-python=$(HOST_DIR)/usr
-else
-HOST_LIBXML2_CONF_OPT += --without-python
-endif
+HOST_LIBXML2_CONF_OPT = --without-zlib --without-lzma --without-python
 
 ifeq ($(BR2_PACKAGE_ZLIB),y)
 LIBXML2_DEPENDENCIES += zlib

diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in
index 852d6d0ed4e8ac5abc53037e7a206aa086c05011..c1be9e39d149091c96d3adfce1a60d27b5751fd6 100644 (file)
--- a/package/mesa3d/Config.in
+++ b/package/mesa3d/Config.in
@@ -2,7 +2,6 @@ menuconfig BR2_PACKAGE_MESA3D
        bool "mesa3d"
        select BR2_PACKAGE_LIBDRM
        select BR2_PACKAGE_EXPAT
-       select BR2_PACKAGE_HOST_LIBXML2_PYTHON
        select BR2_PACKAGE_XPROTO_DRI2PROTO if BR2_PACKAGE_XORG7
        select BR2_PACKAGE_XPROTO_XF86DRIPROTO if BR2_PACKAGE_XORG7
        select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7

diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk
index 4a00dac1ebfe11a033a5cec87afe33f84975a62d..6b9383b3fc156211bde0e6d4be845f7df99e4032 100644 (file)
--- a/package/mesa3d/mesa3d.mk
+++ b/package/mesa3d/mesa3d.mk
@@ -20,7 +20,6 @@ MESA3D_DEPENDENCIES = \
        host-bison \
        host-flex \
        host-gettext \
-       host-libxml2 \
        host-python \
        host-xutil_makedepend \
        libdrm