From patchwork Fri Feb 15 10:00:08 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: 220706 X-Patchwork-Delegate: thomas.petazzoni@free-electrons.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 1A9702C007E for ; Fri, 15 Feb 2013 21:09:37 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 5C37510B8F8; Fri, 15 Feb 2013 10:09:22 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id d0ZpUklazozr; Fri, 15 Feb 2013 10:09:08 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id B69DA10B895; Fri, 15 Feb 2013 10:09:05 +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 390838F753 for ; Fri, 15 Feb 2013 10:09:23 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 0023F8B46B for ; Fri, 15 Feb 2013 10:09:15 +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 lgDLCLY+Af5e for ; Fri, 15 Feb 2013 10:09:14 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from nm3.bullet.mail.ird.yahoo.com (nm3.bullet.mail.ird.yahoo.com [77.238.189.60]) by whitealder.osuosl.org (Postfix) with SMTP id 886CA8AD4C for ; Fri, 15 Feb 2013 10:09:13 +0000 (UTC) Received: from [77.238.189.48] by nm3.bullet.mail.ird.yahoo.com with NNFMP; 15 Feb 2013 10:09:11 -0000 Received: from [46.228.39.64] by tm1.bullet.mail.ird.yahoo.com with NNFMP; 15 Feb 2013 10:09:11 -0000 Received: from [127.0.0.1] by smtp101.mail.ir2.yahoo.com with NNFMP; 15 Feb 2013 10:09:11 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.fr; s=s1024; t=1360922951; 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=ZKApy5RjrfYCOhzbWqq4wUjCqbi60rJ12LzDezgjR2GGjt7g8BSf49IKE5ACaPbhepsNL6obhk8JDzX8dIjmV6kvfmgwaWv5FxQbBQvJqQ+FveMveFXPJgCcpBu0TpN9V86PKz+wuzHwPvbF9HyjCQK4YJ1cxhp80RKu0IIHsR4= X-Yahoo-Newman-Id: 322068.61011.bm@smtp101.mail.ir2.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: wGgxJBEVM1kGzhdfCSy8TlNIUkrySEvTyDccrZiKK3vGe4S e7EYjxO0CMU.csKEdTPr3NosEpReBBC3rhk8_AEIqkJMVi._rla3AJinDJO0 4GCAHawkSHGHFYd_iEF_ZLItZS_wt9wbjPXoBLLomh.zb0Mt5mfE3GrUiW7_ XmFkXaXXqGFd8cAlyNXxcrkQd_FvsN6zMHXAfH2Dn5SALrMnyOTy0Rvd5UiJ HSKsAiwJ9qMmmX6HoBbq3rX9w9sIqMIcyPBE93daQ7Le0hisyUot1g0YpcdU zZBiwnR_2tqor02o0VhHKa1ema2AWp1.cscNGiCpFMH6l1fLnWxOfvWW0_M1 nj1vfx7xLp5SapzP.4TRJS7JIog2qq91X5VqJUwshkR0YMxYmzAoY_NxJYwO mdS64kAsEXB1sOYvN20xBoIEbbr.0prXvOHURkqKTrWnTawTqtTvRrh36VIU 7CsmpIn.Fp15WPcqacS_vbP3TRkndUZ7Uaa5Q_hmyo22_gBBvBbxHURIBMz6 IaAvKrv3iUGsC8H86xmZe89k- X-Yahoo-SMTP: gXxkLaeswBDA9gtBSIbQ8XWSflp0 Received: from troinex.lan.sensometrix.ch (kpa_info@46.140.83.238 with login) by smtp101.mail.ir2.yahoo.com with SMTP; 15 Feb 2013 10:09:11 +0000 UTC From: Patrick Gerber To: buildroot@busybox.net Date: Fri, 15 Feb 2013 11:00:08 +0100 Message-Id: <1360922412-32559-2-git-send-email-kpa_info@yahoo.fr> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1360922412-32559-1-git-send-email-kpa_info@yahoo.fr> References: <1360922412-32559-1-git-send-email-kpa_info@yahoo.fr> Subject: [Buildroot] [PATCH v4 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