From nobody Thu May 2 22:39:10 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=quarantine dis=quarantine) header.from=virtuozzo.com ARC-Seal: i=1; a=rsa-sha256; t=1610971495; cv=none; d=zohomail.com; s=zohoarc; b=GSVkG5qjDMMXHoa+nB74T0GVPKn7nGcfbNfM8qBwMLb8lGz4Hb4j8kYc/cUuu2ax1l7UgAaibIYRbkaZOXw2B/TolyoDF9aVaz59s8yNeBlAIpQAwSEPqhZoWrnvzcyYh2maxeOFHioFqpEQLE0WmTSmHDpgwl3agKedtlkDJrY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610971495; h=Content-Type:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:Sender:Subject:To; bh=Cv2GH1YSCT97kxvXOXg6INl3SU+VakbcW4gmWPI6H54=; b=KOvNL3aDPF1e8nPaPdgERlk1k64xGWTl+zqtQhUf0Z676AQ940CVVjVD48DXzJJcQz7B3Yw4aTPfgk9cUKdRgmIlirqThFRzfF+Y1CceIwqNL9UW7QMwcCrzef6qvdgDPYLV5twMnQ5c1saDaBULF8CGDecONJh1pr57A04wqVs= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=quarantine dis=quarantine) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1610971494958761.6393546452284; Mon, 18 Jan 2021 04:04:54 -0800 (PST) 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-299-t3PniDggO7asAP8f2jryGA-1; Mon, 18 Jan 2021 07:04:51 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D1275107ACE6; Mon, 18 Jan 2021 12:04:44 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 35C6D1962F; Mon, 18 Jan 2021 12:04:44 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id C1A16180954D; Mon, 18 Jan 2021 12:04:40 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 10IC4E5k010012 for ; Mon, 18 Jan 2021 07:04:15 -0500 Received: by smtp.corp.redhat.com (Postfix) id BB1082026D11; Mon, 18 Jan 2021 12:04:14 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast06.extmail.prod.ext.rdu2.redhat.com [10.11.55.22]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B6D012026D5D for ; Mon, 18 Jan 2021 12:04:11 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 772CF18154C3 for ; Mon, 18 Jan 2021 12:04:11 +0000 (UTC) Received: from relay3.sw.ru (relay.sw.ru [185.231.240.75]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-200-MN9WgFNfOc60TrSeP9DnOw-1; Mon, 18 Jan 2021 07:04:09 -0500 Received: from [10.28.15.168] (helo=vz7.sw.ru.) by relay3.sw.ru with esmtp (Exim 4.94) (envelope-from ) id 1l1TF9-00GwYK-LF for libvir-list@redhat.com; Mon, 18 Jan 2021 15:02:47 +0300 X-MC-Unique: t3PniDggO7asAP8f2jryGA-1 X-MC-Unique: MN9WgFNfOc60TrSeP9DnOw-1 From: Nikolay Shirokovskiy To: libvir-list@redhat.com Subject: [PATCH] meson: fix vstorage driver build Date: Mon, 18 Jan 2021 15:02:43 +0300 Message-Id: <1610971363-719546-1-git-send-email-nshirokovskiy@virtuozzo.com> X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 2 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" It breaks on using - in VSTORAGE-MOUNT definition with: In file included from ../config.h:19:0, from ../src/util/viraudit.c:22: ./meson-config.h:180:17: error: ISO C99 requires whitespace after the mac= ro name [-Werror] #define VSTORAGE-MOUNT "/usr/bin/vstorage-mount" ^ ./meson-config.h:180:0: error: "VSTORAGE" redefined [-Werror] #define VSTORAGE-MOUNT "/usr/bin/vstorage-mount" ^ ./meson-config.h:178:0: note: this is the location of the previous defini= tion #define VSTORAGE "/usr/bin/vstorage" ^ #define VSTORAGE-MOUNT "/usr/bin/vstorage-mount" --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index b5277b4..aff2565 100644 --- a/meson.build +++ b/meson.build @@ -1974,7 +1974,7 @@ if conf.has('WITH_LIBVIRTD') conf.set('WITH_STORAGE_VSTORAGE', 1) foreach name : ['vstorage', 'vstorage-mount', 'umount'] path =3D get_variable('@0@_prog'.format(name.underscorify())).path= () - conf.set_quoted(name.to_upper(), path) + conf.set_quoted(name.underscorify().to_upper(), path) endforeach endif endif --=20 1.8.3.1