From patchwork Sun Sep 3 09:44:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 809241 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="shWi/hg8"; dkim-atps=neutral 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 3xlSkT660cz9s71 for ; Sun, 3 Sep 2017 19:44:49 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 3837887048; Sun, 3 Sep 2017 09:44: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 BXEP8-5jWIi7; Sun, 3 Sep 2017 09:44:45 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id BAEEC86F77; Sun, 3 Sep 2017 09:44:45 +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 3DAAA1C41C7 for ; Sun, 3 Sep 2017 09:44:43 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 3708382165 for ; Sun, 3 Sep 2017 09:44:43 +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 Buq79be6Bss6 for ; Sun, 3 Sep 2017 09:44:42 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr0-f193.google.com (mail-wr0-f193.google.com [209.85.128.193]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 618B1820F5 for ; Sun, 3 Sep 2017 09:44:42 +0000 (UTC) Received: by mail-wr0-f193.google.com with SMTP id 40so2012914wrv.3 for ; Sun, 03 Sep 2017 02:44:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=deYeDywe7Zasc7gReSt0sg5JML9UNJwLGkSQmOoLbyE=; b=shWi/hg85cpZmNMPbW7xPx3gIexR9ZLeQJRvF2rND+F0hgQ6EJYfqS9qirhkjVviyu yf8032gNq0utcQbuA19Af18amttZjsAXm5ZPZACXI9sBCNyRRiixP9F6ciYQfTKVaGFl 3g+B7RXcYbZjU641leEJH7vYloRCBY9PcAynj2NBOEz8TbVaLRKBNlIiU7TGaCV/zgMz r+Q7YzOIvAGotvCm5TSoW5+LayZP/vih4hmBxey0YspRNZ+d7wlvsJqwPEgDaY6RIqC+ FYjWtbalh/7oWWRXG/BCoSpJT9gRAxbjpjVWYsWzXTXB9Koye93hkAModVvQ8iX/2vfa Q3kA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=deYeDywe7Zasc7gReSt0sg5JML9UNJwLGkSQmOoLbyE=; b=TDpSKsWS323Tc/tSANoBFG9fm6daN6jA0kKrh4xPWwv1aRUNyhZPFVMZXcmHuU3H+l RkhC8FSUQGjbQrIQER2wLPYxspMco0fDMF49FLMot/IgpTGQijvOYY9ARgeHeeaJj2ml frilLK0F9ybfquk+VPj1aPMc2vfVxNHT5tXkvOQ3BLarjKDg33NgB2dbrZ+/ohh+B+Rg fk4fer6YvnhJc+/EYh+PniA32e/TfF8a6NA4yqcBzxcpq5k+VE0HVQeNVeTtmT5mVaSp MaY1PufMINUBvxl1N0m4mtYbedPtK1yq8HCwAYJL8ZpE/0t3edyjU4U8PswN4C5HIP13 J+zw== X-Gm-Message-State: AHPjjUgxJu6isPAv7RNgOEJIGZCUOA1wycXhzGIwAcEeVWGsjMZENQAU 6G0YvcZEroqkH82R X-Google-Smtp-Source: ADKCNb4LIua7W1GLSdalgZ5m/tRvLZ0l4ajWEbTrsBrbXEQayd6b5NNM3p4ixJRTlRpdN3Gx9zXAcA== X-Received: by 10.223.153.106 with SMTP id x97mr665910wrb.87.1504431880689; Sun, 03 Sep 2017 02:44:40 -0700 (PDT) Received: from localhost.localdomain (2a01cb08861073004cc40c703ef54565.ipv6.abo.wanadoo.fr. [2a01:cb08:8610:7300:4cc4:c70:3ef5:4565]) by smtp.gmail.com with ESMTPSA id t135sm1972938wmt.30.2017.09.03.02.44.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 03 Sep 2017 02:44:39 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Sun, 3 Sep 2017 11:44:29 +0200 Message-Id: X-Mailer: git-send-email 2.11.0 In-Reply-To: References: Cc: Thomas Petazzoni , "Yann E. MORIN" Subject: [Buildroot] [PATCH 3/8] toolchain/external-custom: hide versions too old for the current arch 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" When an architecture expresses a requirement on the gcc version, limit the version choice in the custom external toolchain. The ratioanle being that there is no point in offering that version to the user if we know before-hand that the gcc version will not work for that architecture. All versions below the minimum we support is just made conditional to that minimum as well, including the "older" entry. However, this means that the "older" entry is no longer available when the architecture requires a minimum gcc version. A user who wants to use a toolchain with a gcc older than the minimum will have no choice but to realise the toolchain is not suitable (or lie and we would catch that when checking the gcc version anyway). Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni --- Note: this implies that it is no longer possible to use a custom external toolchain in which a specific core has been back-ported Thus, this patch may cause regressions in very specific and rare corner cases. Do we want to support those cases? If yes, then we should drop this patch. --- .../toolchain-external-custom/Config.in.options | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options index ae343ddad5..eb7c30f171 100644 --- a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options @@ -18,6 +18,11 @@ config BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX choice bool "External toolchain gcc version" + default BR2_TOOLCHAIN_EXTERNAL_GCC_7 if BR2_ARCH_NEEDS_GCC_AT_LEAST_7 + default BR2_TOOLCHAIN_EXTERNAL_GCC_6 if BR2_ARCH_NEEDS_GCC_AT_LEAST_6 + default BR2_TOOLCHAIN_EXTERNAL_GCC_5 if BR2_ARCH_NEEDS_GCC_AT_LEAST_5 + default BR2_TOOLCHAIN_EXTERNAL_GCC_4_9 if BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9 + default BR2_TOOLCHAIN_EXTERNAL_GCC_4_8 if BR2_ARCH_NEEDS_GCC_AT_LEAST_4_8 default BR2_TOOLCHAIN_EXTERNAL_GCC_4_3 help Set to the gcc version that is used by your external @@ -29,42 +34,52 @@ config BR2_TOOLCHAIN_EXTERNAL_GCC_7 config BR2_TOOLCHAIN_EXTERNAL_GCC_6 bool "6.x" + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_7 select BR2_TOOLCHAIN_GCC_AT_LEAST_6 config BR2_TOOLCHAIN_EXTERNAL_GCC_5 bool "5.x" + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_6 select BR2_TOOLCHAIN_GCC_AT_LEAST_5 config BR2_TOOLCHAIN_EXTERNAL_GCC_4_9 bool "4.9.x" + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_5 select BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 config BR2_TOOLCHAIN_EXTERNAL_GCC_4_8 bool "4.8.x" + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9 select BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 config BR2_TOOLCHAIN_EXTERNAL_GCC_4_7 bool "4.7.x" + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_4_8 select BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 config BR2_TOOLCHAIN_EXTERNAL_GCC_4_6 bool "4.6.x" + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_4_8 select BR2_TOOLCHAIN_GCC_AT_LEAST_4_6 config BR2_TOOLCHAIN_EXTERNAL_GCC_4_5 bool "4.5.x" + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_4_8 select BR2_TOOLCHAIN_GCC_AT_LEAST_4_5 config BR2_TOOLCHAIN_EXTERNAL_GCC_4_4 bool "4.4.x" + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_4_8 select BR2_TOOLCHAIN_GCC_AT_LEAST_4_4 config BR2_TOOLCHAIN_EXTERNAL_GCC_4_3 bool "4.3.x" + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_4_8 select BR2_TOOLCHAIN_GCC_AT_LEAST_4_3 config BR2_TOOLCHAIN_EXTERNAL_GCC_OLD bool "older" + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_4_8 help Use this option if your GCC version is older than any of the above.