From patchwork Sun Sep 27 21:07:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Roederer X-Patchwork-Id: 1372171 X-Patchwork-Delegate: daniel@makrotopia.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=geroedel.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=hXcFxJQl; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Bzyvp4DzKz9sSC for ; Mon, 28 Sep 2020 07:09:42 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.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=NbafC1JmNTi5TkC5egoC7zIbN0T10HEbN45AS+LgkW0=; b=hXcFxJQlrVP++sDn0+L6tGYwmz 2GSzt+ZnVCL6stpvcR6NrSLksRApuDF88kRaaxotPJl65iDd/UvKhpmTvqV8i6Dk+JS/rW98rLUBl TJCTGaeM8meRY4eKAe5QIhQygbRKvGj5xFlbx8NMtaCxqbW6kyksIXt1HmWp1bUAWYqyyF1AOW0XE 0roU7CUtB+t7iHI3UCYVgacneZXP2BTEgL9hvVs07IyEvvvIJGCJKF+1A4eLcTaQ5oANHTPdwSFOb DkCHjyZ7fa2/aDMmBj7MJ83IfVrQorS0qztqTEynxJRzRy/ObISaSITWV+ibLA5ShuSUL1xm0TZuI HGAT/OMw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kMdtu-0002CZ-Mg; Sun, 27 Sep 2020 21:08:06 +0000 Received: from [2a02:180:2:aa:1::b3] (helo=dazzle.geroedel.de) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kMdts-0002CF-0B for openwrt-devel@lists.openwrt.org; Sun, 27 Sep 2020 21:08:05 +0000 Received: from [192.168.15.2] (helo=feeble.bln.roederer.dhs.org) by dazzle.geroedel.de with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1kMdtp-0003Oz-7P for openwrt-devel@lists.openwrt.org; Sun, 27 Sep 2020 23:08:02 +0200 Received: from build.bln.roederer.dhs.org ([192.168.8.5] helo=build) by feeble.bln.roederer.dhs.org with smtp (Exim 4.92) (envelope-from ) id 1kMdto-0007Yv-Oa for openwrt-devel@lists.openwrt.org; Sun, 27 Sep 2020 23:08:00 +0200 Received: (nullmailer pid 21509 invoked by uid 10000); Sun, 27 Sep 2020 21:07:51 -0000 From: Sven Roederer To: openwrt-devel@lists.openwrt.org Date: Sun, 27 Sep 2020 23:07:38 +0200 Message-Id: <20200927210738.21460-1-devel-sven@geroedel.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Spam_score: -2.9 X-Spam_score_int: -28 X-Spam_bar: -- X-Spam_report: Spam detection software, running on the system "dazzle", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see @@CONTACT_ADDRESS@@ for details. Content preview: The buildroot and SDK both require the compilers (gcc, g++) to be installed on the host system, however the ImageBuilder uses precompiled binaries. This patch changes the prerequirements checks to skip the checking for the compilers if running as ImageBuilder. A similar change has been made for libncurses-dev in 4a1a58a3e2d2. Content analysis details: (-2.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-SA-Exim-Connect-IP: 192.168.15.2 X-SA-Exim-Mail-From: devel-sven@geroedel.de X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dazzle X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00 autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH] build, imagebuilder: Do not require compilers X-SA-Exim-Version: 4.2.1 (built Tue, 02 Aug 2016 21:08:31 +0000) X-SA-Exim-Scanned: Yes (on dazzle.geroedel.de) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200927_170804_166711_49451088 X-CRM114-Status: GOOD ( 15.57 ) X-Spam-Score: 1.3 (+) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (1.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 1.3 RDNS_NONE Delivered to internal network by a host with no rDNS X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org The buildroot and SDK both require the compilers (gcc, g++) to be installed on the host system, however the ImageBuilder uses precompiled binaries. This patch changes the prerequirements checks to skip the checking for the compilers if running as ImageBuilder. A similar change has been made for libncurses-dev in 4a1a58a3e2d2. Signed-off-by: Sven Roederer Acked-by: Paul Spooren --- include/prereq-build.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/prereq-build.mk b/include/prereq-build.mk index 4637c6ca50..f67a01299e 100644 --- a/include/prereq-build.mk +++ b/include/prereq-build.mk @@ -26,6 +26,7 @@ $(eval $(call TestHostCommand,proper-umask, \ Please build with umask 022 - other values produce broken packages, \ umask | grep -xE 0?0[012][012])) +ifndef IB $(eval $(call SetupHostCommand,gcc, \ Please install the GNU C Compiler (gcc) 4.8 or later, \ $(CC) -dumpversion | grep -E '^(4\.[8-9]|[5-9]\.?|10\.?)', \ @@ -37,7 +38,9 @@ $(eval $(call TestHostCommand,working-gcc, \ it appears to be broken, \ echo 'int main(int argc, char **argv) { return 0; }' | \ gcc -x c -o $(TMP_DIR)/a.out -)) +endif +ifndef IB $(eval $(call SetupHostCommand,g++, \ Please install the GNU C++ Compiler (g++) 4.8 or later, \ $(CXX) -dumpversion | grep -E '^(4\.[8-9]|[5-9]\.?|10\.?)', \ @@ -50,6 +53,7 @@ $(eval $(call TestHostCommand,working-g++, \ echo 'int main(int argc, char **argv) { return 0; }' | \ g++ -x c++ -o $(TMP_DIR)/a.out - -lstdc++ && \ $(TMP_DIR)/a.out)) +endif ifndef IB $(eval $(call TestHostCommand,ncurses, \