From nobody Fri May 17 03:12:49 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=1598387512; cv=none; d=zohomail.com; s=zohoarc; b=GKyYNDfteKX4UvjFjL4OPlJ5K9qB5J0Gldi3NSxHiyGSpb0ZqRxAt3Z4qzR+uKWOFvR0CM8zwmaZj43ccgUqL2DY1UgK5Mz4P5tdZ29272Bibis+Xa5NArx7T40ynDX7gDTpWD2VxYFTRkG5sGvykOVDK3tfDPksg2/8BMAOJbI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598387512; 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=y36b6+F4fvBLFHexe3GxE6WOyCvopwBITCWdpa2KS2M=; b=Kk5hjH4NEEb5USPRGGyNZBHD23ZRMDMVOI0UHsmoZFnGkLxPtjPD4t/DnGwfsOPxZs93xLD0Kp6kAkp3IEN5Z+nYi94ysfrpmlH9mZWmnmUgQFqOqQ1hSao0jFADr5zhB0IMwzL1DG7ia+vna+byQcLJ13Alww3oaNszn9jUy7A= 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 1598387512394902.5022913742383; Tue, 25 Aug 2020 13:31:52 -0700 (PDT) Received: from localhost ([::1]:60710 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kAfbj-0001C8-57 for importer@patchew.org; Tue, 25 Aug 2020 16:31:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55974) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAfYA-0005aH-0v for qemu-devel@nongnu.org; Tue, 25 Aug 2020 16:28:10 -0400 Received: from mta-02.yadro.com ([89.207.88.252]:35288 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 1kAfY4-0006Ne-Tq for qemu-devel@nongnu.org; Tue, 25 Aug 2020 16:28:09 -0400 Received: from localhost (unknown [127.0.0.1]) by mta-01.yadro.com (Postfix) with ESMTP id 746E457502; Tue, 25 Aug 2020 20:28:01 +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 37rjtLfX8I3o; Tue, 25 Aug 2020 23:28:00 +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 6484F574EC; Tue, 25 Aug 2020 23:28:00 +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; Tue, 25 Aug 2020 23:27:59 +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= 1598387280; x=1600201681; bh=b0G63lLIq4mnzK2xfL55xP+40i9MOQJLuKl +0XEVZ5w=; b=CQpMNTi/byfL/qpJgx4RasPAJXwUu8C9RSZONQGpyJtOglrVaDc VY57uil2g+nHWG4hWB/TRGUIj9E1WYJ5M4iDURpdBp/ARQ4DKeTCciYBIhmbGEz5 iwATTibxj1Wojs+TANf75+oP7byL7uiA00KI+IjPtkp9QW2QYoCuIiNE= X-Virus-Scanned: amavisd-new at yadro.com From: Roman Bolshakov To: Subject: [PATCH v2 1/4] configure: Use discovered make for in-source build Date: Tue, 25 Aug 2020 23:27:52 +0300 Message-ID: <20200825202755.50626-2-r.bolshakov@yadro.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200825202755.50626-1-r.bolshakov@yadro.com> References: <20200825202755.50626-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/25 16:28:01 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 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 , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Paolo Bonzini 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 invoked if in-source build is used but $(MAKE) is the same as the one used in the original make invocation. Some platforms have preference to use gmake, or a make passed as an option to "configure". Honor the choice. Signed-off-by: Roman Bolshakov --- configure | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/configure b/configure index b1e11397a8..07732bf011 100755 --- a/configure +++ b/configure @@ -38,6 +38,11 @@ then # This file is auto-generated by configure to support in-source tree # 'make' command invocation =20 +ifeq ($(wildcard build/config-host.mak),) +$(error Incomplete configuration. Please run `configure`) +endif +include build/config-host.mak + ifeq ($(MAKECMDGOALS),) recurse: all endif @@ -54,6 +59,7 @@ endif force: ; .PHONY: force GNUmakefile: ; +build/config-host.mak: ; =20 EOF cd build --=20 2.28.0 From nobody Fri May 17 03:12:49 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=1598387332; cv=none; d=zohomail.com; s=zohoarc; b=Zyu6FUS7Ht/3Ojq7s1aSE70A7o263GcApyT5t0IX/XMeEHzboEtDlvEP2roQJyinrIxTzUxabcomX+4Z4rH5tBN6VGZFlX2AHVJCMPag4qhwTe0QYxYgfVbZdS9dduW6d7rWa7/uvSy/rHSIGv2Qc5Gc7JoRqWQahc9ytZchqIo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598387332; 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=J0fD3pqpHVyPKdBadSMKlukmzvAJ5YZUnHvPhoc4Vns=; b=P1Z3GnGKJS/UbyTTcl26suJ+zx62eiakKsBClephufpL+UlCoMqofZEWC4AFvV62Ichd+0AilUpUe0nwIYbSjBnPQP80EoIgmlrXPyY3o06thL1Ui/J1lUATpElWXyZIdavPmSDNPKRm/isZ2OmYq13eyM48g8thPggNE5rEpTs= 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 1598387332193713.3484589709169; Tue, 25 Aug 2020 13:28:52 -0700 (PDT) Received: from localhost ([::1]:53228 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kAfYo-0006NG-Gp for importer@patchew.org; Tue, 25 Aug 2020 16:28:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55952) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAfY7-0005WV-Tz for qemu-devel@nongnu.org; Tue, 25 Aug 2020 16:28:07 -0400 Received: from mta-02.yadro.com ([89.207.88.252]:35306 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 1kAfY5-0006Nx-0l for qemu-devel@nongnu.org; Tue, 25 Aug 2020 16:28:07 -0400 Received: from localhost (unknown [127.0.0.1]) by mta-01.yadro.com (Postfix) with ESMTP id 8906E574E9; Tue, 25 Aug 2020 20:28:02 +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 S3hJVS0Zs4Ke; Tue, 25 Aug 2020 23:28:01 +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 8CAB057501; Tue, 25 Aug 2020 23:28:00 +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; Tue, 25 Aug 2020 23:28:00 +0300 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yadro.com; h= content-transfer-encoding:content-type:content-type:mime-version :references:in-reply-to:x-mailer:message-id:date:date:subject :subject:from:from:received:received:received; s=mta-01; t= 1598387281; x=1600201682; bh=mmJ/dT2Mse58phPOjXVCrsjbijaIJyvPfGG wzIZFk+M=; b=V1TVkKKHOZBig5toUV+jvF0YTqR6HExrE1au4O+wFuIGt0djUvs VbvnZVeibTlwHrwIyUZDvv2HSh39Jo75Y19EEnFlPLc69Plx3+Bp6uvPzh5XeqFq EKY6w//w5uiVfzbsVRzsIlUGCZuDz9MIaan969dnojiaKwnIRS8Uczwk= X-Virus-Scanned: amavisd-new at yadro.com From: Roman Bolshakov To: Subject: [PATCH v2 2/4] Makefile: Require GNU make 3.82+ Date: Tue, 25 Aug 2020 23:27:53 +0300 Message-ID: <20200825202755.50626-3-r.bolshakov@yadro.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200825202755.50626-1-r.bolshakov@yadro.com> References: <20200825202755.50626-1-r.bolshakov@yadro.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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/25 16:28:01 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 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 , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @yadro.com) 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. Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Roman Bolshakov Reviewed-by: Thomas Huth --- Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Makefile b/Makefile index 81794d5c34..b4ebf3e30f 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 03:12:49 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=1598387444; cv=none; d=zohomail.com; s=zohoarc; b=ma8WDo7eRsIxSJldKeX0HDSZxvKwRCws2hkx1DVJqzs+oH7rXMnkmrlDCK8XH8Td+scp44qeuclJS0MPjq0jY32ZrVNccHbDvP5RPwdFDcsLcB5RBaUeZaaCyZQZx1HGmoW6TeD57X1PU+YFv1cyI/LrhHQ85TJxXg+h1UOnjhU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598387444; 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=P0noPvMvc3JC91kwWplKvJk/L/zfCw3PGNVgRKLXDMI=; b=Fb1CWVjYKcH1Tx6WwDzlWVhJTXEB27rFkz8UtG9o3xVEyip2YpN7m3YER56e39j2S+6rc+FEtHWSgUODX3Fut2TZtpM2WMfiEXPNRF2xl8ZPstJqh6SIo0tvJ/j7IApUkgpBkr8KRRZMbY7l5dsWQyt9N/jlUUg4nHnvt2bNTaU= 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 1598387444733863.0329136011674; Tue, 25 Aug 2020 13:30:44 -0700 (PDT) Received: from localhost ([::1]:57922 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kAfad-0008ML-Gd for importer@patchew.org; Tue, 25 Aug 2020 16:30:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55958) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAfY8-0005X3-5s for qemu-devel@nongnu.org; Tue, 25 Aug 2020 16:28:08 -0400 Received: from mta-02.yadro.com ([89.207.88.252]:35310 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 1kAfY5-0006O0-5y for qemu-devel@nongnu.org; Tue, 25 Aug 2020 16:28:07 -0400 Received: from localhost (unknown [127.0.0.1]) by mta-01.yadro.com (Postfix) with ESMTP id A5AC457501; Tue, 25 Aug 2020 20:28:02 +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 6kWsY9YtsYN8; Tue, 25 Aug 2020 23:28:01 +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 31DDF574EA; Tue, 25 Aug 2020 23:28:01 +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; Tue, 25 Aug 2020 23:28:01 +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= 1598387281; x=1600201682; bh=TbQEarL239nqt/ACiFvj/GPvI1T0st/AiN4 tRxK7WqI=; b=Iygl/1WW8S88ikiqZ7idB404LBl3SPqxPfW9v1JYmr5bDCamwtE F4in4yZhm5DR0V0dmY4U7+nnC++UjsoAuUSaF1s2GWuy6T5gOE8k9Qh+OdYuSUFR 7bfbkJ0rjpCLvXA+5nC9bBNeSyohsQvUsFdSd7jq70I7gFxJ365Kn/NU= X-Virus-Scanned: amavisd-new at yadro.com From: Roman Bolshakov To: Subject: [PATCH v2 3/4] configure: Prefer gmake on darwin Date: Tue, 25 Aug 2020 23:27:54 +0300 Message-ID: <20200825202755.50626-4-r.bolshakov@yadro.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200825202755.50626-1-r.bolshakov@yadro.com> References: <20200825202755.50626-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/25 16:28:01 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 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 , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Paolo Bonzini 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 --- configure | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/configure b/configure index 07732bf011..664084992b 100755 --- a/configure +++ b/configure @@ -907,6 +907,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" @@ -920,6 +921,31 @@ 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) + +ifeq ($(wildcard config-host.mak),) +$(error Incomplete configuration. Please run `configure`) +endif +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: ; +config-host.mak: ; + +EOF ;; SunOS) solaris=3D"yes" --=20 2.28.0 From nobody Fri May 17 03:12:49 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=1598387428; cv=none; d=zohomail.com; s=zohoarc; b=YwcykgGaqcy2mqdJArXb2zYu8rnxuMTHHQ4T+JlxR9d739IFZm9257OsgOS16Phw5A8UOQQ06+7oFsiSQq0x/ZTATEJUXYamLn3Ndr0uTrl05KuiGDQY3TLZrvCpCM8RgeQ3/SHdmFtq/zCyZhmHwAr9C+yKfBC52sihdlzMvb4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598387428; 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=tQRmHsoKZboEm+0cU7+tH0aALhVl9vtb6qLaLwKAYSs=; b=nEjha8bn2xxt4IL4SPkFRXwv1nNkUgLSuY+IwAhnHazomN/UFDYUYjeoByXiCHM4k4mTlnjP16jTQnsTLq1Gy/4TgxrYJaXwU+9WKs/oEpY2uLarxDmvvlve+cpuuOo4noJmvjlxf4L+G5lHYzZf6fAUgfQjX45RwjLvc5xoiTQ= 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 1598387428530485.86647632974245; Tue, 25 Aug 2020 13:30:28 -0700 (PDT) Received: from localhost ([::1]:57336 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kAfaN-00087U-0V for importer@patchew.org; Tue, 25 Aug 2020 16:30:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55970) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAfY9-0005YM-5S for qemu-devel@nongnu.org; Tue, 25 Aug 2020 16:28:09 -0400 Received: from mta-02.yadro.com ([89.207.88.252]:35316 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 1kAfY4-0006OQ-Up for qemu-devel@nongnu.org; Tue, 25 Aug 2020 16:28:08 -0400 Received: from localhost (unknown [127.0.0.1]) by mta-01.yadro.com (Postfix) with ESMTP id 9897457057; Tue, 25 Aug 2020 20:28:03 +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 6cWmjN2YdHJx; Tue, 25 Aug 2020 23:28:02 +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 C270557505; Tue, 25 Aug 2020 23:28:01 +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; Tue, 25 Aug 2020 23:28:01 +0300 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yadro.com; h= content-transfer-encoding:content-type:content-type:mime-version :references:in-reply-to:x-mailer:message-id:date:date:subject :subject:from:from:received:received:received; s=mta-01; t= 1598387282; x=1600201683; bh=V0615/o4rDYJWyo2Vh9bJHGyTvqVrxlhmHO XQGtLiOQ=; b=kyVlr+X9dTUbmrA3M53Hm0o0kAHpaHPButXC1mIlBZHvtIwTABC pEvnYZ/lXGo6b9bf1W7ZwiwabQQhUsTOu/1IWlmrMSqB0+zgZZNmHfMqmUWfGrB5 zpWjwJjwwOJo/xM3w+IqyZdXUBOJNUJ2X0dcaylBJ0tTC6sIm7Y5NS08= X-Virus-Scanned: amavisd-new at yadro.com From: Roman Bolshakov To: Subject: [PATCH v2 4/4] configure: Test if $make actually exists Date: Tue, 25 Aug 2020 23:27:55 +0300 Message-ID: <20200825202755.50626-5-r.bolshakov@yadro.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200825202755.50626-1-r.bolshakov@yadro.com> References: <20200825202755.50626-1-r.bolshakov@yadro.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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/25 16:28:01 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 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 , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @yadro.com) 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. Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Roman Bolshakov Reviewed-by: Thomas Huth --- configure | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/configure b/configure index 664084992b..9230832da2 100755 --- a/configure +++ b/configure @@ -2029,6 +2029,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