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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598171598; cv=none; d=zohomail.com; s=zohoarc; b=Gje+jJ+UbFjKoWFEaV/kwVtqAjlHLDtpM6+NAx6OUPag9VhcgpP1LemERb5d7HcgIPGR85S+yFzD8MqXOBNjKk9k/2co1OJrKRiAuKTCRJOfcvu7E3k0a3hAIiWPVWBeeDgqKCoxB+Yg3RmIuWV9RlzaMTvf/dF9fyGPx6BZnZw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598171598; h=Content-Type:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:Sender:Subject:To; bh=7XF5L7EjFt5FvEK1b9JfyjrMR+afqRtPfd2sKmLQsxE=; b=NOKSeOTZr00ffGiNlG4Yl530p0g/DLZAT2qKt9838h0pZHbzl7cQnu5ELdbpqZ5PEjqz/v9LPDG+plgUWp5EIzynbwZH7VZFlR8sySEduoMzYAPw7a0fSmqqL29UtPdaeN70V2Wkq+1wwHXmxjHw0eP2Ev9b/+46bO11qFP9vok= 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 1598171598259739.4135296025474; Sun, 23 Aug 2020 01:33:18 -0700 (PDT) Received: from localhost ([::1]:57468 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k9lRE-00087F-HK for importer@patchew.org; Sun, 23 Aug 2020 04:33:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48934) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k9lQV-0007ej-SU for qemu-devel@nongnu.org; Sun, 23 Aug 2020 04:32:31 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:22106 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k9lQT-00023D-53 for qemu-devel@nongnu.org; Sun, 23 Aug 2020 04:32:31 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-318-oRWwSqY7ODO6CDYSZV016w-1; Sun, 23 Aug 2020 04:32:22 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7BEC380EF8C for ; Sun, 23 Aug 2020 08:32:21 +0000 (UTC) Received: from thuth.com (ovpn-112-57.ams2.redhat.com [10.36.112.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id B76BB2AAA5; Sun, 23 Aug 2020 08:32:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598171546; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type; bh=7XF5L7EjFt5FvEK1b9JfyjrMR+afqRtPfd2sKmLQsxE=; b=AGcGq1G0onlkzoyd/TppWZH4pFX5G9EVnmYXNAO1mNRvWfOIPmsFjUUu5KV25AA66ZVlNu 4t1Wm+zhr7C6fv2BLLdpdWN4sb0kgu2f/LwnBxbNukXSzwNWSH0ppdZnLrXaf4NgEMftZJ hfxypfc7DFHr4hz239fUeq8Byes6AzY= X-MC-Unique: oRWwSqY7ODO6CDYSZV016w-1 From: Thomas Huth To: qemu-devel@nongnu.org, Paolo Bonzini Subject: [PATCH] meson: Build qemu-nbd on macOS again Date: Sun, 23 Aug 2020 10:32:15 +0200 Message-Id: <20200823083215.14952-1-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0.0 X-Mimecast-Originator: redhat.com 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=205.139.110.120; envelope-from=thuth@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/23 04:32:26 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Before switching to the meson build system, we used to compile qemu-nbd for macOS, too, which is especially important for running the iotests there. Commit b7c70bf2c5 disabled it by accident, since it did not take into consideration that the $bsd variable in the configure script was also set to "yes" on macOS. Fix it by enabling qemu-nbd on all systems but Windows now instead (which was likely the original intention of the old code in the configure script). Fixes: b7c70bf2c5 ("meson: qemu-{img,io,nbd}") Signed-off-by: Thomas Huth Acked-by: Eric Blake Reviewed-by: Marc-Andr=C3=A9 Lureau --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index df5bf728b5..d79f849768 100644 --- a/meson.build +++ b/meson.build @@ -1075,7 +1075,7 @@ if have_tools qemu_io =3D executable('qemu-io', files('qemu-io.c'), dependencies: [block, qemuutil], install: true) qemu_block_tools +=3D [qemu_img, qemu_io] - if targetos =3D=3D 'linux' or targetos =3D=3D 'sunos' or targetos.endswi= th('bsd') + if targetos !=3D 'windows' qemu_nbd =3D executable('qemu-nbd', files('qemu-nbd.c'), dependencies: [block, qemuutil], install: true) qemu_block_tools +=3D [qemu_nbd] --=20 2.18.2