From nobody Sat Sep 28 21:36:31 2024 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1583601959; cv=none; d=zohomail.com; s=zohoarc; b=A/IQ0PrIyN8JLKIL5+HiDn7oQY3igJbLxDm2WU87PZaM7FBxzIwL4WtCxoyz9Ev2Em8ZQpK0EPbfxugssTFRsoKHetWEmveEwgpGJZlsZ4R0by0ifw8/aCfcKNBtydQ5jcijciutpRXSq9RjGkT0enFe1EwGToBY1H2jPq0oopg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583601959; 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=H7T7L99OQDVbIxCTEB+jIvaqywtD0ZftuDW6r9s/Hf0=; b=MbvepiFm0Rvwk6iomsfWb6YBCtnGvIzst+GA5kZIUgJ8FZXpqbWtMolg/MdezOxE9ordYywVP+GBvZNwQM+Q7ZfQ1X1Li6vnpn7PWYEMbM8ZT85TJjh8TsceEMMS/WJAN8yN0Eacv55dYfR9L7XGtZZECFlW9KMRYrXAcipqJfs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail 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 1583601959257658.8931479174373; Sat, 7 Mar 2020 09:25:59 -0800 (PST) Received: from localhost ([::1]:51078 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jAdD4-0001K2-Eb for importer@patchew.org; Sat, 07 Mar 2020 12:25:58 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52217) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jAd9r-0005jW-Pt for qemu-devel@nongnu.org; Sat, 07 Mar 2020 12:22:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jAd9q-0005QO-Kh for qemu-devel@nongnu.org; Sat, 07 Mar 2020 12:22:39 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:26279 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jAd9q-0005Q6-H0 for qemu-devel@nongnu.org; Sat, 07 Mar 2020 12:22:38 -0500 Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-55-TOvEIdJSNI23YAd9C8GNBg-1; Sat, 07 Mar 2020 12:22:35 -0500 Received: by mail-wr1-f71.google.com with SMTP id w11so2605729wrp.20 for ; Sat, 07 Mar 2020 09:22:35 -0800 (PST) Received: from x1w.redhat.com (47.red-88-21-205.staticip.rima-tde.net. [88.21.205.47]) by smtp.gmail.com with ESMTPSA id d15sm52096074wrp.37.2020.03.07.09.22.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 07 Mar 2020 09:22:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1583601758; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=H7T7L99OQDVbIxCTEB+jIvaqywtD0ZftuDW6r9s/Hf0=; b=LaD9RS/TI+u42zbfNdAGHZWsckk8ZDRVcXu0VVIoEDJAEj5NxEyRKB2cLPmnnVBYztymou MrgOOO8fJIwLGiqxP/b1O1DQOLmHcVPyNKcJ/rDYlKnwxzbQKBPD1Z8RIcxG0lk1UFGJwS NpmkJFokk/GwcQJISZK+KnhY1CTHG0Y= X-MC-Unique: TOvEIdJSNI23YAd9C8GNBg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=iKSYfxKjMD7Cb1qgoag60tedE3tMw/hvzBypcSrEkXA=; b=gK2By/XmtnR4cFazYNFsTaLjbREagPfMHq3QREzcpOjV75aDwK492Gb2tnwnY5n0hU YNFFTfUhdwp5X4//jZ36BoxraUYYXILQ8rXDNDUvHZ+L6LluJsyXI5ow8kw6StyYNhf6 MA7Re9q+gOE+Ep7oLkxYPYzsWtq4npz40UTaG2DUvxv1XW0aViDXHayVFpA+aYMLias6 u4yGeJ6TFDRc0fcpfGHLw8gzRpWe/+NW5Iem57mgdSumxXHCt6mOM1q/K7dwMO8jGgd1 i9ucAFAatidLV8xwUQjPbOyypcmuGekdhXa/6gssCd+ctVb+EhYMdVNkH4gallMmGpsP UBFA== X-Gm-Message-State: ANhLgQ3qJTO9hdfLA6vbRWE4Uxz0QoXUrBtvnrb39wxUY+0b3W5KffLl pOdgb+CLj+4xWvEpjwExKyiIC/WJN47sQlO3ApfxL5WmZh9LdItVRdcVxJoVYGfOv1uQZvFGjGS ti6MIMZ8078rJLlo= X-Received: by 2002:a1c:4e03:: with SMTP id g3mr10512317wmh.22.1583601754228; Sat, 07 Mar 2020 09:22:34 -0800 (PST) X-Google-Smtp-Source: ADFU+vvWrC2cd3D+wn8unY4UnsfDnUISFeshpqpt2X7p1OHittKMLP9otmBPzOdrQ3XnDr61wZZEjg== X-Received: by 2002:a1c:4e03:: with SMTP id g3mr10512292wmh.22.1583601753976; Sat, 07 Mar 2020 09:22:33 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 2/3] configure: Fix building with SASL on Windows Date: Sat, 7 Mar 2020 18:22:21 +0100 Message-Id: <20200307172222.14764-3-philmd@redhat.com> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200307172222.14764-1-philmd@redhat.com> References: <20200307172222.14764-1-philmd@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 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: Fam Zheng , Alexey Pavlov , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9=20=D0=9F=D0=B0=D0=B2=D0=BB=D0=BE=D0=B2?= , =?UTF-8?q?=D0=9C=D0=B5=D1=82=D0=BB=D0=B8=D1=86=D0=BA=D0=B8=D0=B9=20=D0=AE=D1=80=D0=B8=D0=B9=20=D0=92=D0=B8=D0=BA=D1=82=D0=BE=D1=80=D0=BE=D0=B2=D0=B8=D1=87?= , Biswapriyo Nath , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Youry Metlitsky Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" The Simple Authentication and Security Layer (SASL) library re-defines the struct iovec on Win32 [*]. QEMU also re-defines it in "qemu/osdep.h". The two definitions then clash on a MinGW build. We can avoid the SASL definition by defining STRUCT_IOVEC_DEFINED. Add the definition to vnc_sasl_cflags if we are uing MinGW. [*] https://github.com/cyrusimap/cyrus-sasl/blob/cyrus-sasl-2.1.27/include/= sasl.h#L187 Cc: Alexey Pavlov Cc: Biswapriyo Nath Cc: Youry Metlitsky Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- configure | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 0c2dd1eb08..0bc87ce42a 100755 --- a/configure +++ b/configure @@ -3375,7 +3375,13 @@ if test "$vnc" =3D "yes" && test "$vnc_sasl" !=3D "n= o" ; then int main(void) { sasl_server_init(NULL, "qemu"); return 0; } EOF # Assuming Cyrus-SASL installed in /usr prefix - vnc_sasl_cflags=3D"" + if test "$mingw32" =3D "yes" && test "$iovec" !=3D "yes"; then + # QEMU defines struct iovec in "qemu/osdep.h", + # we don't want libsasl to redefine it in . + vnc_sasl_cflags=3D"-DSTRUCT_IOVEC_DEFINED" + else + vnc_sasl_cflags=3D"" + fi vnc_sasl_libs=3D"-lsasl2" if compile_prog "$vnc_sasl_cflags" "$vnc_sasl_libs" ; then vnc_sasl=3Dyes --=20 2.21.1