From patchwork Wed Feb 13 09:20:33 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: kpa_info@yahoo.fr X-Patchwork-Id: 220093 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id AC44B2C008E for ; Wed, 13 Feb 2013 20:21:54 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id D6A1B31266; Wed, 13 Feb 2013 09:21:51 +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 CKlxkYJkcVhd; Wed, 13 Feb 2013 09:21:50 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 2D35C31279; Wed, 13 Feb 2013 09:21: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 2D4DB8F753 for ; Wed, 13 Feb 2013 09:21:56 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id A130584C65 for ; Wed, 13 Feb 2013 09:21:48 +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 4oBf9+63dwpT for ; Wed, 13 Feb 2013 09:21:40 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from nm19-vm0.bullet.mail.ird.yahoo.com (nm19-vm0.bullet.mail.ird.yahoo.com [77.238.189.92]) by whitealder.osuosl.org (Postfix) with SMTP id 37D1F8057D for ; Wed, 13 Feb 2013 09:21:14 +0000 (UTC) Received: from [77.238.189.55] by nm19.bullet.mail.ird.yahoo.com with NNFMP; 13 Feb 2013 09:21:14 -0000 Received: from [46.228.39.87] by tm8.bullet.mail.ird.yahoo.com with NNFMP; 13 Feb 2013 09:21:14 -0000 Received: from [127.0.0.1] by smtp124.mail.ir2.yahoo.com with NNFMP; 13 Feb 2013 09:21:14 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.fr; s=s1024; t=1360747274; bh=MmnAwYqnQBxoazDCnX2M/jD1H6Qsa7zDbwC4uI78a9k=; h=X-Yahoo-Newman-Id:X-Yahoo-Newman-Property:X-YMail-OSG:X-Yahoo-SMTP:Received:From:To:Cc:Subject:Date:Message-Id:X-Mailer:In-Reply-To:References; b=gIs5n37KUYqPpWwabiZzNZ9z8vS1VBq6xf3guUloWavEsUZWNlweC27AMh6CmUS/w9227t3scNFMIHx3G4DsP/FalvXK+94zprUQAIeLfUYz4TajHT9ax+D/4aHPdq44+cfBQOgtg0pq872BmrWUs1ILlFv9bpvZYl4tdpdkOBU= X-Yahoo-Newman-Id: 146178.54431.bm@smtp124.mail.ir2.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: dEbu4y4VM1kCXMGPQJg.Vry8mDF2uheqxkZp1CKNPp0TsFE 0VyuO052A.A43ipIO.OqqRxb39jzQEcqRfXIFjcKHWwHirjX19fG.O2c.9mM hSl7IBfQzNg7K2uGbADEAHdzXIsGDHNfEEbQ9Owoxp7GV2W5xDEcUaCy2ZKp ESJvFhg_hUnTmXgH0sugxvBlkGuq5gA7qp61vbsHnLWtuaQ.Ze5Q3rPM6UoD soHRgc8FCIxzXw85_HtliPMGPX5b5DoYbzXYDvqkGvYsHXfk9pz3kq2h7Onb 4cygvIIUVVhPtE7Wx2ntImpJdrhPujaxDQpYAvdkRbEyKv8WKee7Zoe45jFn tK.r8It2vdaPmasuOALODL.j0QSFkuqOWytEpqAm1U84vvYJv_tgjor1j1qV ej34SeX9enz0jiuI5zf8YDv_FwFwiF__bdBLXjP9vL6uBlnW9ZHk7hQMKxsC xgtbSekpK3Zqh4wBI3Lpw7tuYxBTD2oTjuNj1abHLypoUfwnKDufP2EssnIZ .04kfupUz_WMmpzCHfpLibS4- X-Yahoo-SMTP: gXxkLaeswBDA9gtBSIbQ8XWSflp0 Received: from troinex.lan.sensometrix.ch (kpa_info@46.140.83.238 with login) by smtp124.mail.ir2.yahoo.com with SMTP; 13 Feb 2013 09:21:14 +0000 UTC From: Patrick Gerber To: buildroot@busybox.net Date: Wed, 13 Feb 2013 10:20:33 +0100 Message-Id: <1360747237-30048-2-git-send-email-kpa_info@yahoo.fr> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1360747237-30048-1-git-send-email-kpa_info@yahoo.fr> References: <1360747237-30048-1-git-send-email-kpa_info@yahoo.fr> Subject: [Buildroot] [PATCH v3 1/5] Python menu reorganization 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 In order to have a better support for python external package make the python menu clearer. Python2 and Python3 are now mutually exclusive Signed-off-by: Patrick Gerber --- package/Config.in | 3 ++- package/python-common/Config.in | 35 +++++++++++++++++++++++++++++++++++ package/python/Config.in | 14 -------------- package/python3/Config.in | 14 -------------- 4 files changed, 37 insertions(+), 29 deletions(-) create mode 100644 package/python-common/Config.in diff --git a/package/Config.in b/package/Config.in index 2fad94d..5f2c1bd 100644 --- a/package/Config.in +++ b/package/Config.in @@ -315,9 +315,10 @@ endmenu endif source "package/microperl/Config.in" source "package/php/Config.in" +source "package/python-common/Config.in" source "package/python/Config.in" source "package/python3/Config.in" -if BR2_PACKAGE_PYTHON +if (BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3) menu "external python modules" source "package/python-bottle/Config.in" source "package/python-dpkt/Config.in" diff --git a/package/python-common/Config.in b/package/python-common/Config.in new file mode 100644 index 0000000..6523c21 --- /dev/null +++ b/package/python-common/Config.in @@ -0,0 +1,35 @@ +config BR2_PACKAGE_PYTHON_COMMON + bool "Python" + depends on BR2_USE_WCHAR + # uses fork() + depends on BR2_USE_MMU + help + The python language interpreter. + + http://www.python.org/ + +comment "python3 requires a toolchain with WCHAR support" + depends on !BR2_USE_WCHAR + +choice + depends on BR2_PACKAGE_PYTHON_COMMON + prompt "Python interpreter" + help + Select which version of Python you would like to use. + +config BR2_PACKAGE_PYTHON + bool "python2" + select BR2_PACKAGE_LIBFFI + help + Use Python 2.x + + +config BR2_PACKAGE_PYTHON3 + bool "python3" + # uses fork() + depends on BR2_USE_MMU + select BR2_PACKAGE_LIBFFI + help + Use Python 3.x + +endchoice diff --git a/package/python/Config.in b/package/python/Config.in index 4089cce..b4fd6c2 100644 --- a/package/python/Config.in +++ b/package/python/Config.in @@ -1,17 +1,3 @@ -config BR2_PACKAGE_PYTHON - bool "python" - depends on BR2_USE_WCHAR - # uses fork() - depends on BR2_USE_MMU - select BR2_PACKAGE_LIBFFI - help - The python language interpreter. - - http://www.python.org/ - -comment "python requires a toolchain with WCHAR support" - depends on !BR2_USE_WCHAR - if BR2_PACKAGE_PYTHON choice diff --git a/package/python3/Config.in b/package/python3/Config.in index 5959d31..279f31b 100644 --- a/package/python3/Config.in +++ b/package/python3/Config.in @@ -1,17 +1,3 @@ -config BR2_PACKAGE_PYTHON3 - bool "python3" - depends on BR2_USE_WCHAR - # uses fork() - depends on BR2_USE_MMU - select BR2_PACKAGE_LIBFFI - help - The python language interpreter. - - http://www.python.org/ - -comment "python3 requires a toolchain with WCHAR support" - depends on !BR2_USE_WCHAR - if BR2_PACKAGE_PYTHON3 choice