From patchwork Sun Feb 2 12:11:22 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas De Schampheleire X-Patchwork-Id: 316001 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 7AC462C009B for ; Sun, 2 Feb 2014 23:11:59 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 3E37F93A31; Sun, 2 Feb 2014 12:11:51 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id BbKl793IrokY; Sun, 2 Feb 2014 12:11:50 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 8647493A42; Sun, 2 Feb 2014 12:11:50 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 6CB7B1CE802 for ; Sun, 2 Feb 2014 12:11:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 64D558B158 for ; Sun, 2 Feb 2014 12:11:46 +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 hQi-ZAUuAkkq for ; Sun, 2 Feb 2014 12:11:45 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wg0-f44.google.com (mail-wg0-f44.google.com [74.125.82.44]) by whitealder.osuosl.org (Postfix) with ESMTPS id 19A1783A32 for ; Sun, 2 Feb 2014 12:11:44 +0000 (UTC) Received: by mail-wg0-f44.google.com with SMTP id l18so10658966wgh.23 for ; Sun, 02 Feb 2014 04:11:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=content-type:mime-version:content-transfer-encoding:subject :message-id:in-reply-to:references:user-agent:date:from:to; bh=biwbif8Ep//uzYlBBsm6JTTkpqDOTBn9dMskruaqWWg=; b=zOaJImdW9q/61ipVN5LmM5a04F0vyrMnzx6Uj+2LqS+smlLbG9Y0KIyxaZwR7TM283 eIuEuDfdbA6u3b+hT9rk3+k9jzn2FQ3p5iVkgBILO4z5ZUV6rM+a6T09TN2ESvchuTLh QCOkarz9EuI4sifsr6cOQWu2EgexHMkrJbKdWiozovFHfXDytLVH6IC7tozjRGJoTun9 Nm4YANrdkZ4qr5nmtEbaBdy6Gk2uEi6EyQF/+uuT9tE6sVDciMPuq3c/n+4i7Y7JD1Vs ffeJy1H6EuvLJ1scX7jULUa6NwgUUY+YUmZ0uKbwl3z/fDla74IUc1p1gqJCklNOGOjL WGNQ== X-Received: by 10.194.86.200 with SMTP id r8mr786367wjz.49.1391343103703; Sun, 02 Feb 2014 04:11:43 -0800 (PST) Received: from [127.0.1.1] (d54C62EEB.access.telenet.be. [84.198.46.235]) by mx.google.com with ESMTPSA id ea4sm15523490wib.7.2014.02.02.04.11.41 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 02 Feb 2014 04:11:42 -0800 (PST) MIME-Version: 1.0 X-Mercurial-Node: 86fd4417f44a50ecc5291a84df760960e29c0027 Message-Id: <86fd4417f44a50ecc529.1391343082@argentina> In-Reply-To: References: User-Agent: Mercurial-patchbomb/2.2.2 Date: Sun, 02 Feb 2014 13:11:22 +0100 From: Thomas De Schampheleire To: buildroot@busybox.net Subject: [Buildroot] [PATCH 7 of 9] ola: automatically enable python bindings if python is enabled 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: , Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net For packages with optional python bindings, these bindings can be enabled automatically when python is enabled. There is no need for explicit configuration options, unless there is a very good reason to do so. No legacy option was enabled as there is no impact on users that had the original explicit symbol enabled. Ola itself has optional python bindings, these are now automatically enabled if python is enabled. The rdm tests are treated as a package that requires python, and thus _selects_ python rather than depending on it. This commit additionally adds a missing dependency on wchar, needed for python. Signed-off-by: Thomas De Schampheleire --- package/ola/Config.in | 15 ++++++--------- package/ola/ola.mk | 2 +- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/package/ola/Config.in b/package/ola/Config.in --- a/package/ola/Config.in +++ b/package/ola/Config.in @@ -27,14 +27,6 @@ config BR2_PACKAGE_OLA_WEB help Build OLA with browser interface. -config BR2_PACKAGE_OLA_PYTHON_BINDINGS - bool "python bindings" - select BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON_PROTOBUF - depends on BR2_USE_MMU - help - Build OLA with support for the Python language. - config BR2_PACKAGE_OLA_SLP bool "slp tools" help @@ -52,11 +44,16 @@ config BR2_PACKAGE_OLA_EXAMPLES config BR2_PACKAGE_OLA_RDM_TESTS bool "rdm tests" - select BR2_PACKAGE_OLA_PYTHON_BINDINGS + select BR2_PACKAGE_PYTHON depends on BR2_USE_MMU + depends on BR2_USE_WCHAR # python help Build OLA RDM tests. +comment "rdm tests need a toolchain w/ wchar" + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR + endmenu menu "plugin selections" diff --git a/package/ola/ola.mk b/package/ola/ola.mk --- a/package/ola/ola.mk +++ b/package/ola/ola.mk @@ -45,7 +45,7 @@ else OLA_CONF_OPT += --disable-slp endif -ifeq ($(BR2_PACKAGE_OLA_PYTHON_BINDINGS),y) +ifeq ($(BR2_PACKAGE_PYTHON),y) OLA_CONF_OPT += --enable-python-libs OLA_DEPENDENCIES += python python-protobuf else