From patchwork Wed May 7 20:09:40 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 346798 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id A29551401AC for ; Thu, 8 May 2014 06:11:43 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id ED1F98B9E4; Wed, 7 May 2014 20:11:42 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id tlD-H6mcPYnS; Wed, 7 May 2014 20:11:39 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id B08FB8C137; Wed, 7 May 2014 20:10:51 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id AD03A1D0784 for ; Wed, 7 May 2014 20:10:26 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 5406A26B43 for ; Wed, 7 May 2014 20:10:26 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id bA9lHQEhnmO3 for ; Wed, 7 May 2014 20:10:22 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailout03.t-online.de (mailout03.t-online.de [194.25.134.81]) by silver.osuosl.org (Postfix) with ESMTPS id B0ABB2671C for ; Wed, 7 May 2014 20:10:21 +0000 (UTC) Received: from fwd10.aul.t-online.de (fwd10.aul.t-online.de [172.20.26.152]) by mailout03.t-online.de (Postfix) with SMTP id 67B714F3E16 for ; Wed, 7 May 2014 22:09:39 +0200 (CEST) Received: from fli4l.lan.fli4l (TlsfD0ZAZhCHdpA444hfjGu3dwc1S3HGbRPw2BEJBKCcwl6tJ19KpUZ1xyOc6yowIu@[79.247.128.159]) by fwd10.t-online.de with esmtp id 1Wi8AT-0U2SFU0; Wed, 7 May 2014 22:10:17 +0200 Received: from fli4lbuild64.lan.fli4l ([192.168.1.51]:41664) by fli4l.lan.fli4l with esmtpsa (TLSv1.2:DHE-RSA-AES256-GCM-SHA384:256) (Exim 4.80.1) (envelope-from ) id 1Wi8AS-0004UJ-8N; Wed, 07 May 2014 22:10:16 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Wed, 7 May 2014 22:09:40 +0200 Message-Id: <1399493406-7247-7-git-send-email-bernd.kuhls@t-online.de> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1399493406-7247-1-git-send-email-bernd.kuhls@t-online.de> References: <1399493406-7247-1-git-send-email-bernd.kuhls@t-online.de> X-ID: TlsfD0ZAZhCHdpA444hfjGu3dwc1S3HGbRPw2BEJBKCcwl6tJ19KpUZ1xyOc6yowIu X-TOI-MSGID: fcd6fc53-bdee-406f-be6d-f8e0e3759565 Cc: Bernd Kuhls Subject: [Buildroot] [PATCH v5 06/32] mesa3d: Remove dependency for the libxml2 module of host-python X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net 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 --- package/libxml2/Config.in | 3 --- package/libxml2/libxml2-python2.patch | 27 --------------------------- package/libxml2/libxml2.mk | 14 -------------- package/mesa3d/Config.in | 1 - package/mesa3d/mesa3d.mk | 1 - 5 files changed, 46 deletions(-) delete mode 100644 package/libxml2/libxml2-python2.patch diff --git a/package/libxml2/Config.in b/package/libxml2/Config.in index 85694f9..ebd63fe 100644 --- 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 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 - -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 62f3e27..7644a48 100644 --- a/package/libxml2/libxml2.mk +++ b/package/libxml2/libxml2.mk @@ -22,20 +22,6 @@ 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 - ifeq ($(BR2_PACKAGE_ZLIB),y) LIBXML2_DEPENDENCIES += zlib LIBXML2_CONF_OPT += --with-zlib diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index b645712..703b465 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -2,7 +2,6 @@ menuconfig BR2_PACKAGE_MESA3D bool "Mesa 3D Graphics Library" 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 b0a11ab..1708a3e 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -18,7 +18,6 @@ MESA3D_DEPENDENCIES = \ host-bison \ host-flex \ host-gettext \ - host-libxml2 \ host-python \ host-xutil_makedepend \ libdrm