From patchwork Sun Nov 26 16:12:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Peter_P=C3=B6schl?= X-Patchwork-Id: 841412 X-Patchwork-Delegate: blogic@openwrt.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=65.50.211.133; helo=bombadil.infradead.org; envelope-from=lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="rkJtoZ+Y"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nest-ai.de header.i=@nest-ai.de header.b="rQVUUwsh"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3ylFMP2dqZz9s3w for ; Mon, 27 Nov 2017 03:12:49 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:Message-ID:Date:To :From:Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=8X1Cdynm+L7XLZtM4yaD9dmlZqsurmwGVeE03OAcekE=; b=rkJtoZ+YKhDPy/ FfxDdplVGLdCvRAqZXSljNvJGAua3K66wjtZFl5HFN/o93o53lJSHaFazB8MsjBk0Bf6dmz1O1lVY 0abfTXrL92If/QmjdVJ+HC6bG9kIVETxhriOgx11qWqVxwl3qdyknLUZbIyZ2nj8+p/D1guBkd2aJ Eddzf0q0ZRkmOjfXFB6mz8h2d0XcOAvKjvdanj8jEpxkNFn6/eYVGlccp7vRSr2oShoePzl9GxpgV xK+mU3h4dnnLCVWbXJ2gZSg9ux3vXWmZWJcj98td2JH1khlvuscrop2BihoGMweieAuztbuGjAq7y BhWwpT2frn9l5hbdfm2g==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1eIzXo-00058L-OY; Sun, 26 Nov 2017 16:12:36 +0000 Received: from mo6-p00-ob.smtp.rzone.de ([2a01:238:20a:202:5300::4]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eIzXi-000566-JN for lede-dev@lists.infradead.org; Sun, 26 Nov 2017 16:12:34 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1511712725; s=domk; d=nest-ai.de; h=Content-Type:Content-Transfer-Encoding:MIME-Version:Date:Subject:To: From; bh=5N2ghfZNtvh2r0n5jz6/2yMUHxtWx1ZhY1ygiOVoaiE=; b=rQVUUwsh4AZQT41tzRcKqA3JQPMSPHjVFofJ+zBMlQcVpKkujG4Rb/l05h9lvIjXGj r1aRg87NjEEdgY5GSGrive97Dq7aqjhyMG6ioh0e8IjQZUANOHUfddDy2sYG8Mpkg6HC RIvnIJkRv7iLc/T6quQJhkLUerz2zpkrPsIBM= X-RZG-AUTH: :PGkQcFLma/CC42jm/gQadFUBM0+BCU0UdyBbdURzyGzSB8XXShgigPUW2sMmSXZdnOPFPI/16b8x8+NTSoeK8BpMspRvQELeKq5c/B4IFtpytG6hig== X-RZG-CLASS-ID: mo00 Received: from Gehenna.nest-ai.de ([2001:a61:116d:c201:a143:a62b:3846:51de]) by smtp.strato.de (RZmta 42.9 AUTH) with ESMTPSA id R00589tAQGC4hNV (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (curve secp521r1 with 521 ECDH bits, eq. 15360 bits RSA)) (Client did not present a certificate) for ; Sun, 26 Nov 2017 17:12:04 +0100 (CET) Received: from gehenna.localnet (localhost [127.0.0.1]) by Gehenna.nest-ai.de (Postfix) with ESMTP id 941F633919E for ; Sun, 26 Nov 2017 17:12:04 +0100 (CET) From: Peter =?iso-8859-1?q?P=F6schl?= To: lede-dev@lists.infradead.org Date: Sun, 26 Nov 2017 17:12:04 +0100 Message-ID: <3898884.n4tFKsfmyP@gehenna> User-Agent: KMail/5.2.3 (Linux/4.13.0-1-amd64; KDE/5.37.0; x86_64; ; ) MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171126_081231_041621_E640959D X-CRM114-Status: UNSURE ( 6.39 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [2a01:238:20a:202:5300:0:0:4 listed in] [list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Subject: [LEDE-DEV] [RFC] toolchain: fix GCC version check causing failure on Debian Testing with gcc-7 X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org In Debian Stretch/Testing gcc version 7 is called gcc-7 and g++-7 and 'gcc -dumpversion' returns '7' which causes 'make defconfig' to fail with Build dependency: Please install the GNU C Compiler ... Build dependency: Please install the GNU C++ Compiler ... The following patch is minimal invasive. Alternatively, it would be more robust to use the regex '^(4\.[8-9]|5\.[0-9]|6\.[0-9]|7($$$$$$$$|.\[0-9]))' instead (currently even 1.4.0 would be accepted), but this might have backward-compatibility ramifications. Signed-off-by: Peter Pöschl Signed-off-by: Peter Pöschl Signed-off-by: Peter Pöschl diff --git a/include/prereq-build.mk b/include/prereq-build.mk index c6f99a2071..43a8da290f 100644 --- a/include/prereq-build.mk +++ b/include/prereq-build.mk @@ -28,13 +28,14 @@ $(eval $(call TestHostCommand,proper-umask, \ $(eval $(call SetupHostCommand,gcc, \ Please install the GNU C Compiler (gcc) 4.8 or later \ - $(CC) -dumpversion | grep -E '(4\.[8-9]|5\.[0-9]|6\.[0-9]|7\.[0-9])', \ - gcc -dumpversion | grep -E '(4\.[8-9]|5\.[0-9]|6\.[0-9]|7\.[0-9])', \ + $(CC) -dumpversion | grep -E '(4\.[8-9]|5\.[0-9]|6\.[0-9]|^7$$$$$$$$|7\.[0-9])', \ + gcc -dumpversion | grep -E '(4\.[8-9]|5\.[0-9]|6\.[0-9]|^7$$$$$$$$|7\.[0-9])', \ gcc48 --version | grep gcc, \ gcc49 --version | grep gcc, \ gcc5 --version | grep gcc, \ gcc6 --version | grep gcc, \ gcc7 --version | grep gcc, \ + gcc-7 --version | grep gcc, \ gcc --version | grep Apple.LLVM )) $(eval $(call TestHostCommand,working-gcc, \ @@ -45,13 +46,14 @@ $(eval $(call TestHostCommand,working-gcc, \ $(eval $(call SetupHostCommand,g++, \ Please install the GNU C++ Compiler (g++) 4.8 or later \ - $(CXX) -dumpversion | grep -E '(4\.[8-9]|5\.[0-9]|6\.[0-9]|7\.[0-9])', \ - g++ -dumpversion | grep -E '(4\.[8-9]|5\.[0-9]|6\.[0-9]|7\.[0-9])', \ + $(CXX) -dumpversion | grep -E '(4\.[8-9]|5\.[0-9]|6\.[0-9]|^7$$$$$$$$|7\.[0-9])', \ + g++ -dumpversion | grep -E '(4\.[8-9]|5\.[0-9]|6\.[0-9]|^7$$$$$$$$|7\.[0-9])', \ g++48 --version | grep g++, \ g++49 --version | grep g++, \ g++5 --version | grep g++, \ g++6 --version | grep g++, \ g++7 --version | grep g++, \ + g++-7 --version | grep g++, \ g++ --version | grep Apple.LLVM )) $(eval $(call TestHostCommand,working-g++, \