From nobody Fri May 17 05:50:17 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=yadro.com ARC-Seal: i=1; a=rsa-sha256; t=1598131460; cv=none; d=zohomail.com; s=zohoarc; b=kj6yHpOdIy6V12groiFUVyarevW8mKGX+4Vc7SET9aWqq3kJD1WyBbCXdrUsxN8W9bBVfVyz5y0ayeK39mZ18c9kTb5MKTOyxkKxBuQZfx5ni1/Yqx49ItIksymvF8rjehCxNpf87DFg5z+MhVJZma0GdQEiBVZSstO13ANtIMM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598131460; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=fedpCysyuqPDlFAJO/9U3bnNn06cDWSi3ggrwtHSJ1s=; b=GVDsop8ArQYOjss4GSsM2zStXuy+zAq5KqkKbDL4nf4DDR8FHRjDb4wBIPFzrtZnXK1qTDvUC6QEgUZQS5VpdEOJEjzGQMjOZIKUktG3TFONux079/D4PJEZkZzlDxqDX5XudzP8GGKuVOuTArxv36arXfAscI/dBdv1z/Prtdw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1598131460895386.63308226445963; Sat, 22 Aug 2020 14:24:20 -0700 (PDT) Received: from localhost ([::1]:37500 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k9azr-0001yE-Lf for importer@patchew.org; Sat, 22 Aug 2020 17:24:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49016) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k9axH-0006Yf-6A for qemu-devel@nongnu.org; Sat, 22 Aug 2020 17:21:39 -0400 Received: from mta-02.yadro.com ([89.207.88.252]:55278 helo=mta-01.yadro.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k9axF-0002sD-FC for qemu-devel@nongnu.org; Sat, 22 Aug 2020 17:21:38 -0400 Received: from localhost (unknown [127.0.0.1]) by mta-01.yadro.com (Postfix) with ESMTP id 4F24E5604F for ; Sat, 22 Aug 2020 21:21:34 +0000 (UTC) Received: from mta-01.yadro.com ([127.0.0.1]) by localhost (mta-01.yadro.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id AQkc4fLGQILB for ; Sun, 23 Aug 2020 00:21:33 +0300 (MSK) Received: from T-EXCH-02.corp.yadro.com (t-exch-02.corp.yadro.com [172.17.10.102]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mta-01.yadro.com (Postfix) with ESMTPS id 35194574F4 for ; Sun, 23 Aug 2020 00:21:33 +0300 (MSK) Received: from localhost (172.17.204.212) by T-EXCH-02.corp.yadro.com (172.17.10.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.669.32; Sun, 23 Aug 2020 00:21:33 +0300 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yadro.com; h= content-type:content-type:content-transfer-encoding:mime-version :references:in-reply-to:x-mailer:message-id:date:date:subject :subject:from:from:received:received:received; s=mta-01; t= 1598131293; x=1599945694; bh=BqgzoMCid9ojGf6fIEty6qj4pgzcFFR1Rd2 kQlnOsx0=; b=J+jL68p3XWAcuZxVysdThZsYfolCwkKyGqBlBlBoFelQdmT6gXX 8aomqbiLHbb6lKVxm+z9Bic8a2O1ePEd71m/mw6GF9zXM9+6StKKI/UoiPEKXSvv OqGbRkIJwg4MdRj7/F9lF0zMgO7huWqRJXenkpTaRC1yTi0U/WDhM4KU= X-Virus-Scanned: amavisd-new at yadro.com From: Roman Bolshakov To: Subject: [PATCH 1/4] configure: Use discovered make for in-source build Date: Sun, 23 Aug 2020 00:21:26 +0300 Message-ID: <20200822212129.97758-2-r.bolshakov@yadro.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200822212129.97758-1-r.bolshakov@yadro.com> References: <20200822212129.97758-1-r.bolshakov@yadro.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [172.17.204.212] X-ClientProxiedBy: T-EXCH-01.corp.yadro.com (172.17.10.101) To T-EXCH-02.corp.yadro.com (172.17.10.102) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=89.207.88.252; envelope-from=r.bolshakov@yadro.com; helo=mta-01.yadro.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/22 17:21:34 X-ACL-Warn: Detected OS = Linux 3.11 and newer X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Roman Bolshakov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @yadro.com) Content-Type: text/plain; charset="utf-8" A recursive make is inovked if in-source build is used but $(MAKE) is the same as the one used in the original make invocaton. Some platforms have preference to use gmake, or a make passed as an option to "configure". Honor the choice. Signed-off-by: Roman Bolshakov Reviewed-by: Daniel P. Berrang=C3=A9 --- configure | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configure b/configure index 4e5fe33211..9e0d505067 100755 --- a/configure +++ b/configure @@ -38,6 +38,8 @@ then # This file is auto-generated by configure to support in-source tree # 'make' command invocation =20 +include build/config-host.mak + ifeq ($(MAKECMDGOALS),) recurse: all endif --=20 2.28.0 From nobody Fri May 17 05:50:17 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=yadro.com ARC-Seal: i=1; a=rsa-sha256; t=1598131545; cv=none; d=zohomail.com; s=zohoarc; b=MqwTFNQaOl+eiB2XYWHo3WFEiyVldS7AezZ/6A0fIU49/RmYzekbcQdkVqAyxCopibZ3eaZcV4kad9qOIv/16EhbRIoM8ZAO5hTLlSF03HPWh9KGoDgAqiNckIG0F86ZSs+isRcFLN4I8rf3fdoWRv2RYy3NxSkxX+DLltq59Nk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598131545; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=E0NS51tIcI0tbjMwIQuYp//SoRKrd7hjLD1I5dHxSoo=; b=Ywtzef2ImaJQ94WJFenq6wFMrJqbx1HiY5RDTczF981UulcY8/IquOud2LrsSYwKqb8vdtEwU/ISTPYuImYZw/hw3gscM5GSezjVdjmdj5UByPQI+gRtS3RIwoAEyXqCUAyYBi5gDV5IP2RnbRkiTjYEKf25vGaOpfQutV4AyNw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1598131545747949.5149713195445; Sat, 22 Aug 2020 14:25:45 -0700 (PDT) Received: from localhost ([::1]:39864 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k9b1E-00034J-Er for importer@patchew.org; Sat, 22 Aug 2020 17:25:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49046) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k9axI-0006Ys-C9 for qemu-devel@nongnu.org; Sat, 22 Aug 2020 17:21:40 -0400 Received: from mta-02.yadro.com ([89.207.88.252]:55286 helo=mta-01.yadro.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k9axG-0002sJ-FA for qemu-devel@nongnu.org; Sat, 22 Aug 2020 17:21:40 -0400 Received: from localhost (unknown [127.0.0.1]) by mta-01.yadro.com (Postfix) with ESMTP id 5D8C757501 for ; Sat, 22 Aug 2020 21:21:35 +0000 (UTC) Received: from mta-01.yadro.com ([127.0.0.1]) by localhost (mta-01.yadro.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4xYNa3qSKoMA for ; Sun, 23 Aug 2020 00:21:34 +0300 (MSK) Received: from T-EXCH-02.corp.yadro.com (t-exch-02.corp.yadro.com [172.17.10.102]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mta-01.yadro.com (Postfix) with ESMTPS id A4894574FE for ; Sun, 23 Aug 2020 00:21:33 +0300 (MSK) Received: from localhost (172.17.204.212) by T-EXCH-02.corp.yadro.com (172.17.10.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.669.32; Sun, 23 Aug 2020 00:21:33 +0300 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yadro.com; h= content-type:content-type:content-transfer-encoding:mime-version :references:in-reply-to:x-mailer:message-id:date:date:subject :subject:from:from:received:received:received; s=mta-01; t= 1598131294; x=1599945695; bh=X0aqPMLO4Z8BTN6b/qCe3yclg9y0lybBAdT fc4NP/Zs=; b=D9XaM8kl98RPz50Tp6IuNmFofoEz+5tLur9YpxxOer4XVIkwAK8 A1wEDhXJFiR476BK3WGlDPGPIg07EJec4nJy0HF4xdoluiUl5GGaLOJYLwQBznrF k7EoTMr7ZEtbg1CIDPvDmxtVhslEVdQh2nx0O77Q2CrFFW5+Nv9BQlIo= X-Virus-Scanned: amavisd-new at yadro.com From: Roman Bolshakov To: Subject: [PATCH 2/4] Makefile: Require GNU make 3.82+ Date: Sun, 23 Aug 2020 00:21:27 +0300 Message-ID: <20200822212129.97758-3-r.bolshakov@yadro.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200822212129.97758-1-r.bolshakov@yadro.com> References: <20200822212129.97758-1-r.bolshakov@yadro.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [172.17.204.212] X-ClientProxiedBy: T-EXCH-01.corp.yadro.com (172.17.10.101) To T-EXCH-02.corp.yadro.com (172.17.10.102) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=89.207.88.252; envelope-from=r.bolshakov@yadro.com; helo=mta-01.yadro.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/22 17:21:34 X-ACL-Warn: Detected OS = Linux 3.11 and newer X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Roman Bolshakov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @yadro.com) Content-Type: text/plain; charset="utf-8" QEMU build fails with cryptic messages if make is too old: Makefile.ninja:2655: *** multiple target patterns. Stop. To avoid the confusion it's worth to fail the build right away and print a friendly error message. Signed-off-by: Roman Bolshakov Reviewed-by: Daniel P. Berrang=C3=A9 --- Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Makefile b/Makefile index 8373ddccc9..45d688b87b 100644 --- a/Makefile +++ b/Makefile @@ -4,6 +4,11 @@ ifneq ($(words $(subst :, ,$(CURDIR))), 1) $(error main directory cannot contain spaces nor colons) endif =20 +ifeq ($(filter undefine,$(value .FEATURES)),) +$(error Unsupported Make version: $(MAKE_VERSION). \ + Please use GNU Make 3.82 or above) +endif + # Always point to the root of the build tree (needs GNU make). BUILD_DIR=3D$(CURDIR) =20 --=20 2.28.0 From nobody Fri May 17 05:50:17 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=yadro.com ARC-Seal: i=1; a=rsa-sha256; t=1598131360; cv=none; d=zohomail.com; s=zohoarc; b=DaWRUh/mpxWaow5vJsOcqsC15oia4soV5/kq660wVXrKMtO81JOVOte5fent+EzvW6jGx45ZqzhYE+M0T25axDJRjjcHo1YEyIEe9nAiGOzx1uCQAyGJm5Y/ehjPUv+vJio586ZrsL47D6a1lAFuq1lY4RSYjqAnf4o2ynL1AsY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598131360; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=dKed2ofCqSFvZXatZWsS5WAZl6n+Jp2GtMAFwadqVPI=; b=gAbBgQJF1YsxRbMIPcTi65dbTLc8drd0sYk0qRJt+U5J/U3r+Locv79vSLQu5IKhL/QZsrHFAIEYVe+3/agMYeYIxuR6G7iw6AO8vTF5vyww67MB2Mc61M/pUFrwPXYFka77dMyfhcRKAcIc+PkNB5ggT7/HKxucZdo5fT5vSEo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1598131360017483.6065885815008; Sat, 22 Aug 2020 14:22:40 -0700 (PDT) Received: from localhost ([::1]:59640 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k9ayE-0007rZ-Jm for importer@patchew.org; Sat, 22 Aug 2020 17:22:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49048) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k9axJ-0006a0-6P for qemu-devel@nongnu.org; Sat, 22 Aug 2020 17:21:41 -0400 Received: from mta-02.yadro.com ([89.207.88.252]:55290 helo=mta-01.yadro.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k9axF-0002sM-U2 for qemu-devel@nongnu.org; Sat, 22 Aug 2020 17:21:40 -0400 Received: from localhost (unknown [127.0.0.1]) by mta-01.yadro.com (Postfix) with ESMTP id 7971F574FE for ; Sat, 22 Aug 2020 21:21:35 +0000 (UTC) Received: from mta-01.yadro.com ([127.0.0.1]) by localhost (mta-01.yadro.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 3SKiDktXMx_P for ; Sun, 23 Aug 2020 00:21:34 +0300 (MSK) Received: from T-EXCH-02.corp.yadro.com (t-exch-02.corp.yadro.com [172.17.10.102]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mta-01.yadro.com (Postfix) with ESMTPS id 3E55E57500 for ; Sun, 23 Aug 2020 00:21:34 +0300 (MSK) Received: from localhost (172.17.204.212) by T-EXCH-02.corp.yadro.com (172.17.10.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.669.32; Sun, 23 Aug 2020 00:21:34 +0300 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yadro.com; h= content-type:content-type:content-transfer-encoding:mime-version :references:in-reply-to:x-mailer:message-id:date:date:subject :subject:from:from:received:received:received; s=mta-01; t= 1598131294; x=1599945695; bh=cU87q7VjSQ7DT4SSAI1PFtzSa3ilhdRsc8F iQiUp/RM=; b=PH6FdTK50ZaH2nL07g1mk/6AK7y547r+G0x0oEJO95+k7ceeblF EfJydjLIe/9qgQL1lkKUl73qwGRpiOGcAq70D7GzwZJmMRJ2ofy7RvtAVNHQDjs+ Zq/d2ZxsZtks6n/1VSiuSSlm8SOXiZBkSJeap065vjuLrn82v73sPm24= X-Virus-Scanned: amavisd-new at yadro.com From: Roman Bolshakov To: Subject: [PATCH 3/4] configure: Prefer gmake on darwin Date: Sun, 23 Aug 2020 00:21:28 +0300 Message-ID: <20200822212129.97758-4-r.bolshakov@yadro.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200822212129.97758-1-r.bolshakov@yadro.com> References: <20200822212129.97758-1-r.bolshakov@yadro.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [172.17.204.212] X-ClientProxiedBy: T-EXCH-01.corp.yadro.com (172.17.10.101) To T-EXCH-02.corp.yadro.com (172.17.10.102) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=89.207.88.252; envelope-from=r.bolshakov@yadro.com; helo=mta-01.yadro.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/22 17:21:34 X-ACL-Warn: Detected OS = Linux 3.11 and newer X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Roman Bolshakov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @yadro.com) Content-Type: text/plain; charset="utf-8" New meson/make build requires GNU make 3.82+ but macOS ships 3.81 even on Big Sur while homebrew provides GNU make 4.3 as 'gmake' in $PATH. With the change, 'make' switches over to gmake implicitly. Signed-off-by: Roman Bolshakov Reviewed-by: Daniel P. Berrang=C3=A9 --- configure | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/configure b/configure index 9e0d505067..90b02b7271 100755 --- a/configure +++ b/configure @@ -903,6 +903,7 @@ Darwin) darwin=3D"yes" hax=3D"yes" hvf=3D"yes" + make=3D"${MAKE-gmake}" LDFLAGS_SHARED=3D"-bundle -undefined dynamic_lookup" if [ "$cpu" =3D "x86_64" ] ; then QEMU_CFLAGS=3D"-arch x86_64 $QEMU_CFLAGS" @@ -916,6 +917,27 @@ Darwin) # won't work when we're compiling with gcc as a C compiler. QEMU_CFLAGS=3D"-DOS_OBJECT_USE_OBJC=3D0 $QEMU_CFLAGS" HOST_VARIANT_DIR=3D"darwin" + cat > GNUmakefile <<'EOF' +# This file is auto-generated by configure to implicitly switch from a 'ma= ke' +# invocation to 'gmake' + +OLD_MAKE :=3D $(MAKE) + +include config-host.mak + +ifeq ($(MAKECMDGOALS),) +recurse: all +endif + +.NOTPARALLEL: % +%: force + @echo 'Switch from $(OLD_MAKE) to $(MAKE)' + @$(MAKE) -f Makefile $(MAKECMDGOALS) +force: ; +.PHONY: force +GNUmakefile: ; + +EOF ;; SunOS) solaris=3D"yes" --=20 2.28.0 From nobody Fri May 17 05:50:17 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=yadro.com ARC-Seal: i=1; a=rsa-sha256; t=1598131358; cv=none; d=zohomail.com; s=zohoarc; b=Fg7vwLyOtmwMCI8rErUL6EDCMGBB1qNhwcRoqdhzRiUWOpAgWmR/5m7nPzZTVy83qx430iz8RV4XTiWvKRHxnzEW/QWAjseCJ0xvGU54/DcPzc33CXYPivBo/VRK3JcMDuI7DX1XALmWHG8V6JIH/tONbhDSXV/tIKwZxNkFkjE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598131358; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=iKtfmgWjY4tb0oEkoxJWpIBhgx8N+b5NKht7Hz8h79s=; b=SZsrS2QKPUZBbj+AsrwXdIpAR5zgNVjKv7vcfNomKmmc3kH+3bpoPzO9DW3iZgq88TJLoz1DJeiKf9RxVXeHCApvWprNqJ/qbbHHuhD1aClEZzW3iIwQ15gbFBZIgzvhzrX2uki0Xbt/s3r0ePt2SxIugl1XC00txXV9kEthDKg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 15981313586894.926939527007107; Sat, 22 Aug 2020 14:22:38 -0700 (PDT) Received: from localhost ([::1]:59496 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k9ayD-0007nU-1X for importer@patchew.org; Sat, 22 Aug 2020 17:22:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49044) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k9axI-0006Yr-95 for qemu-devel@nongnu.org; Sat, 22 Aug 2020 17:21:40 -0400 Received: from mta-02.yadro.com ([89.207.88.252]:55294 helo=mta-01.yadro.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k9axF-0002sa-Qz for qemu-devel@nongnu.org; Sat, 22 Aug 2020 17:21:39 -0400 Received: from localhost (unknown [127.0.0.1]) by mta-01.yadro.com (Postfix) with ESMTP id 7A79057500 for ; Sat, 22 Aug 2020 21:21:36 +0000 (UTC) Received: from mta-01.yadro.com ([127.0.0.1]) by localhost (mta-01.yadro.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xmj0NrDzKkIv for ; Sun, 23 Aug 2020 00:21:35 +0300 (MSK) Received: from T-EXCH-02.corp.yadro.com (t-exch-02.corp.yadro.com [172.17.10.102]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mta-01.yadro.com (Postfix) with ESMTPS id CDEEF574F4 for ; Sun, 23 Aug 2020 00:21:34 +0300 (MSK) Received: from localhost (172.17.204.212) by T-EXCH-02.corp.yadro.com (172.17.10.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.669.32; Sun, 23 Aug 2020 00:21:34 +0300 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yadro.com; h= content-type:content-type:content-transfer-encoding:mime-version :references:in-reply-to:x-mailer:message-id:date:date:subject :subject:from:from:received:received:received; s=mta-01; t= 1598131295; x=1599945696; bh=1QIf1M3Cw6cdgjhqqG5UgGKsnLRV4Lnz4Dp 1DF0OSoo=; b=F31jBJHPo1OWxrSe6combPPRFrJZns7ZvPPMiud5tXqnwRDjlKn 3jY4UoW6bBgVF34PPSNpCa0qDmFcPgr/sKVCZ1VZhL9K8IF0NZ2ahgKpxTsSoZUz jmNeiwa93BvL+dG2hhVh5fyn/iuSe8FwmkiBUArAO+cK/aBI39B9vf8g= X-Virus-Scanned: amavisd-new at yadro.com From: Roman Bolshakov To: Subject: [PATCH 4/4] configure: Test if $make actually exists Date: Sun, 23 Aug 2020 00:21:29 +0300 Message-ID: <20200822212129.97758-5-r.bolshakov@yadro.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200822212129.97758-1-r.bolshakov@yadro.com> References: <20200822212129.97758-1-r.bolshakov@yadro.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [172.17.204.212] X-ClientProxiedBy: T-EXCH-01.corp.yadro.com (172.17.10.101) To T-EXCH-02.corp.yadro.com (172.17.10.102) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=89.207.88.252; envelope-from=r.bolshakov@yadro.com; helo=mta-01.yadro.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/22 17:21:34 X-ACL-Warn: Detected OS = Linux 3.11 and newer X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Roman Bolshakov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @yadro.com) Content-Type: text/plain; charset="utf-8" configure doesn't detect if $make is installed on the build host. This is also helpful for hosts where an alias for make is used, i.e. configure would fail if gmake is not present on macOS. Signed-off-by: Roman Bolshakov Reviewed-by: Daniel P. Berrang=C3=A9 --- configure | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/configure b/configure index 90b02b7271..c324252f60 100755 --- a/configure +++ b/configure @@ -2021,6 +2021,10 @@ if test -z "$python" then error_exit "Python not found. Use --python=3D/path/to/python" fi +if ! has "$make" +then + error_exit "GNU make ($make) not found" +fi =20 # Note that if the Python conditional here evaluates True we will exit # with status 1 which is a shell 'false' value. --=20 2.28.0