From patchwork Mon Jul 4 09:24:27 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 643973 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3rjhW01gWlz9sXx for ; Mon, 4 Jul 2016 19:27:24 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=xV5AhKKY; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 5DEF98A9E8; Mon, 4 Jul 2016 09:27:22 +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 UoA1DkqfG86R; Mon, 4 Jul 2016 09:27:17 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id ABF7A8A9FF; Mon, 4 Jul 2016 09:26:34 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 9D70D1C1E7B for ; Mon, 4 Jul 2016 09:25:56 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 99F8587283 for ; Mon, 4 Jul 2016 09:25:56 +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 a68nzmRvz_KO for ; Mon, 4 Jul 2016 09:25:56 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by fraxinus.osuosl.org (Postfix) with ESMTPS id DB88487247 for ; Mon, 4 Jul 2016 09:25:55 +0000 (UTC) Received: by mail-wm0-f66.google.com with SMTP id r201so20185959wme.0 for ; Mon, 04 Jul 2016 02:25:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=apfdDlnPIKcm0nyIf9KY6B5nksd/QLeWbVt7oxeltkM=; b=xV5AhKKYwEyFQALLwlK86D9EGDehXLrgWPcqnN6IZ9yOmYDAPBZ/pWGwvsgE82Y8ZS S7ylbXXilYtYlVWbgRQWEHHaDrsFn2pKZLHFblaai4hdyrFMtiOSAzSl7wvGlT4iUo5p MRLPpOvqDq96H8loViMpYMg9OnwW868Sfg+3kxDPwJG3hDGzPRFVyeWOws/aGaFDAG2S kulo1nS/gAfgr87RqZQ0KROG7TC2VMozdwyvlH9edHmiU99b/G5eWUcO2gHkdkI7+pk+ U3/xEXiYh6n/WFxjASrnkJ8OhRsA0gMnMPtSkDclu3Q5oCgiqxaAShEFluaRCmGXagtV Zeew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=apfdDlnPIKcm0nyIf9KY6B5nksd/QLeWbVt7oxeltkM=; b=EuhMr0aipI0Qp4tnxjVwLC1YCxfZ2Ai3B8ZIIfrt+2IwseAnm0J/BMuMBsDqowKa0o +ao3lIU9L1yoXRumlWKISAGpCYUxtBZghQcqbUQFgTkLuddRoyiasPK0dhwVUUU+FXVg 6DJ6VAAf8OKbSGtaLM+mu40+5sTrdV09CAZQ02znl6DtNdq/1U/3sUVsMKsTDCr5GGHz 0hHyV2WEzO1eqrDlnpVumSZuWKyUAc6NVcFPlsrBFtrzjGpxacIwx7Sj6IRAf0uW30e9 2yPtYp+Q+GByA1omp/YDwvLPCtgyxvVz63pPw41JiC12WSNSKyLBULW2MEe23k8BOGCa iBuQ== X-Gm-Message-State: ALyK8tIqI945edJoiR5MrWIpoDYsA4uuGht9qdJDbyaOA2a4Gl0LQ8C0JAyFpgbxVaxKnA== X-Received: by 10.194.0.4 with SMTP id 4mr2337371wja.127.1467624354450; Mon, 04 Jul 2016 02:25:54 -0700 (PDT) Received: from gourin.home ([2a01:cb19:84c0:6b00:3e97:eff:fe77:54d6]) by smtp.gmail.com with ESMTPSA id mn2sm4170795wjc.35.2016.07.04.02.25.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 04 Jul 2016 02:25:53 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Mon, 4 Jul 2016 11:24:27 +0200 Message-Id: <91c04604e43d66488a303fde0d389f2961bd2ca4.1467624132.git.yann.morin.1998@free.fr> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: Cc: "Yann E. MORIN" Subject: [Buildroot] [PATCH 16/83 v2] package/php: use 'menuconfig' instead of 'config'+'menu' X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 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" Move the external extensions selection into the bundled extensions' Config.in. Make the menu prompt a comment, reword it so that it is more in line with the following comments. Signed-off-by: "Yann E. MORIN" Acked-by: Arnout Vandecappelle (Essensium/Mind) --- package/Config.in | 16 ---------------- package/php/Config.ext | 20 ++++++++++++++++++-- package/php/Config.in | 2 +- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/package/Config.in b/package/Config.in index a72dd91..8f1c870 100644 --- a/package/Config.in +++ b/package/Config.in @@ -572,22 +572,6 @@ endif source "package/nodejs/Config.in" source "package/perl/Config.in" source "package/php/Config.in" -if BR2_PACKAGE_PHP -if !BR2_STATIC_LIBS -menu "External php extensions" - source "package/php-geoip/Config.in" - source "package/php-gnupg/Config.in" - source "package/php-imagick/Config.in" - source "package/php-memcached/Config.in" - source "package/php-ssh2/Config.in" - source "package/php-yaml/Config.in" - source "package/php-zmq/Config.in" -endmenu -endif -if BR2_STATIC_LIBS -comment "External PHP extensions need a toolchain w/ dynamic library" -endif -endif source "package/python/Config.in" source "package/python3/Config.in" if BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 diff --git a/package/php/Config.ext b/package/php/Config.ext index 82aaf41..0395cb5 100644 --- a/package/php/Config.ext +++ b/package/php/Config.ext @@ -1,4 +1,4 @@ -menu "Extensions" +comment "Generic extensions" config BR2_PACKAGE_PHP_EXT_CALENDAR bool "Calendar" @@ -389,4 +389,20 @@ config BR2_PACKAGE_PHP_EXT_XSL help XSL transformation support -endmenu +if !BR2_STATIC_LIBS + +comment "External extensions" + +source "package/php-geoip/Config.in" +source "package/php-gnupg/Config.in" +source "package/php-imagick/Config.in" +source "package/php-memcached/Config.in" +source "package/php-ssh2/Config.in" +source "package/php-yaml/Config.in" +source "package/php-zmq/Config.in" + +endif # !STATIC_LIBS + +if BR2_STATIC_LIBs +comment "External PHP extensions need a toolchain w/ dynamic library" +endif diff --git a/package/php/Config.in b/package/php/Config.in index eee8d26..7e79179 100644 --- a/package/php/Config.in +++ b/package/php/Config.in @@ -1,4 +1,4 @@ -config BR2_PACKAGE_PHP +menuconfig BR2_PACKAGE_PHP bool "php" help PHP is a widely-used general-purpose scripting