From nobody Tue Feb 10 20:07:30 2026 Delivered-To: importer@patchew.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=1610472655; cv=none; d=zohomail.com; s=zohoarc; b=Vp52B2rObi6WaIYm/p5+P7HcRX1o0/Bc1+bWiw64/HZ36OBJwmHqne0u08d0XLkWIHzGkNQFSGW3/s233kqVyRNIz+rhF9777VGHbk+GjpXKeyXbQznmRzum9dM4aM60lRnL9+gBnCXJtWJ7Xlk/1C2QHpr8TIRel+5FwLup+Ec= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610472655; h=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=IZ0TOcz3fD2IXmTaYkpIyDqSBkwh9M+ZYZS1uqpiRXY=; b=m6aKmWvrUYkxDPXh3xcQCApzwgc5rhIwNhAxE4bbdXEEvGtYaENaccmjZhrTO0tgaBV52KfIzEdxVq03EwixJWu09hOX+rmHqp5pyA3j3oZPYhwFaEpPNIo8fyRTeQOVUyLxSZCaw6DCHZErfC7CYacp0RN90Dsgohf4adp9g1A= 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 1610472655451878.5388060906461; Tue, 12 Jan 2021 09:30:55 -0800 (PST) Received: from localhost ([::1]:56628 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kzNVN-00052Q-Hu for importer@patchew.org; Tue, 12 Jan 2021 12:30:53 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35360) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kzNG8-0003h1-Qg for qemu-devel@nongnu.org; Tue, 12 Jan 2021 12:15:08 -0500 Received: from mail-ej1-x62b.google.com ([2a00:1450:4864:20::62b]:39048) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kzNG6-0004ue-1E for qemu-devel@nongnu.org; Tue, 12 Jan 2021 12:15:08 -0500 Received: by mail-ej1-x62b.google.com with SMTP id n26so4580652eju.6 for ; Tue, 12 Jan 2021 09:15:03 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id k22sm397302edv.33.2021.01.12.09.15.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jan 2021 09:15:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=IZ0TOcz3fD2IXmTaYkpIyDqSBkwh9M+ZYZS1uqpiRXY=; b=o3Et6K5ixZkvDmuxUTnYZnbijsfeiA8B+FGEUI92hO7VaReiq2j+2iwblZ7yZVG90K rP9DdU31cHpMGpIM2lgQTq0leWWA517gNtdVa5wE42rWzEKzS7dHO0xi6iRMq6jWrU5K UdA4Tmdca/9qmqsHbaY5Upu+zgsnoHMfN59y3tse0CfdFBV4/CB0H2LGjiwl1458TwSv nihCkzhc3CSlxC0XUYEe2AXHo6MrrTDnO9tp31silSqgf6HVQAZjsyksIlPIjNopbWQO ZBa/Uq4wBCaJ2zy82Aogf5vIzHL/FjQjNW6BE/abaHxTpUkV4yVuknrsM8R2OLL1EW2G hMkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=IZ0TOcz3fD2IXmTaYkpIyDqSBkwh9M+ZYZS1uqpiRXY=; b=YaLggcWsu2cH6z6MM95Hn3ZWiPzEUnqkzqBgCDxDhKBDUhjr+PLpp2UTfpZEMlxO6S K6NO9qbNujQl9plFE+LKL0rzuI/dVLw2baxZYyzhZHGFW52852LW1HwD2jw2ebi1gZUE 4pfTG9svoxIBeNlUm2SFxoE6fBwH1lH+TWfPZefj6+gKB7uZ/IXoRe/273yX1ScS4nb3 MbIYsWneHaVCo0bC6X0oEKz8spdIoLBI1pOPeZvilmRsLVKc3+FQ6gJm576XsS1LyYEN QREwpqV1kX+7zV1NfeYJ/CTxeb9kTQuLLBysLoCUle/i4O6XpXvaFwNPj1wdFdN0KTHI zZtQ== X-Gm-Message-State: AOAM531sjq26KZsk+yd4Fn3OQHFWTtarxTRPYfxpM5dAeTp2l3GGGZvR hb1hp2AYLfphGvgbYQEC115Nc1osKnv7rA== X-Google-Smtp-Source: ABdhPJyXREYCFAxTktMEnx1jYEkkBkeKql8gqARt1qYU1Gjx5D+w1XdJOXkb0k/SnY3mm79367ErWw== X-Received: by 2002:a17:907:3f29:: with SMTP id hq41mr2883536ejc.227.1610471702981; Tue, 12 Jan 2021 09:15:02 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 12/20] meson: Propagate gnutls dependency Date: Tue, 12 Jan 2021 18:14:42 +0100 Message-Id: <20210112171450.791427-13-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210112171450.791427-1-pbonzini@redhat.com> References: <20210112171450.791427-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::62b; envelope-from=paolo.bonzini@gmail.com; helo=mail-ej1-x62b.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Roman Bolshakov crypto/tlscreds.h includes GnuTLS headers if CONFIG_GNUTLS is set, but GNUTLS_CFLAGS, that describe include path, are not propagated transitively to all users of crypto and build fails if GnuTLS headers reside in non-standard directory (which is a case for homebrew on Apple Silicon). Signed-off-by: Roman Bolshakov Message-Id: <20210102125213.41279-1-r.bolshakov@yadro.com> Signed-off-by: Paolo Bonzini --- block/meson.build | 2 +- io/meson.build | 2 +- meson.build | 5 +++-- storage-daemon/meson.build | 2 +- tests/meson.build | 6 +++--- ui/meson.build | 2 +- 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/block/meson.build b/block/meson.build index d44c92ab04..eeaefe5809 100644 --- a/block/meson.build +++ b/block/meson.build @@ -40,7 +40,7 @@ block_ss.add(files( 'vmdk.c', 'vpc.c', 'write-threshold.c', -), zstd, zlib) +), zstd, zlib, gnutls) =20 softmmu_ss.add(when: 'CONFIG_TCG', if_true: files('blkreplay.c')) =20 diff --git a/io/meson.build b/io/meson.build index bcd8b1e737..bbcd3c53a4 100644 --- a/io/meson.build +++ b/io/meson.build @@ -12,4 +12,4 @@ io_ss.add(files( 'dns-resolver.c', 'net-listener.c', 'task.c', -)) +), gnutls) diff --git a/meson.build b/meson.build index bd4ff3118b..5e95dd6c93 100644 --- a/meson.build +++ b/meson.build @@ -1814,7 +1814,7 @@ blockdev_ss.add(files( 'blockdev-nbd.c', 'iothread.c', 'job-qmp.c', -)) +), gnutls) =20 # os-posix.c contains POSIX-specific functions used by qemu-storage-daemon, # os-win32.c does not @@ -1970,6 +1970,7 @@ qmp =3D declare_dependency(link_whole: [libqmp]) =20 libchardev =3D static_library('chardev', chardev_ss.sources() + genh, name_suffix: 'fa', + dependencies: [gnutls], build_by_default: false) =20 chardev =3D declare_dependency(link_whole: libchardev) @@ -2188,7 +2189,7 @@ if have_tools qemu_io =3D executable('qemu-io', files('qemu-io.c'), dependencies: [block, qemuutil], install: true) qemu_nbd =3D executable('qemu-nbd', files('qemu-nbd.c'), - dependencies: [blockdev, qemuutil], install: true) + dependencies: [blockdev, qemuutil, gnutls], install: true) =20 subdir('storage-daemon') subdir('contrib/rdmacm-mux') diff --git a/storage-daemon/meson.build b/storage-daemon/meson.build index c5adce81c3..68852f3d25 100644 --- a/storage-daemon/meson.build +++ b/storage-daemon/meson.build @@ -1,6 +1,6 @@ qsd_ss =3D ss.source_set() qsd_ss.add(files('qemu-storage-daemon.c')) -qsd_ss.add(blockdev, chardev, qmp, qom, qemuutil) +qsd_ss.add(blockdev, chardev, qmp, qom, qemuutil, gnutls) =20 subdir('qapi') =20 diff --git a/tests/meson.build b/tests/meson.build index 1fa068f27b..29ebaba48d 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -159,11 +159,11 @@ if have_block 'CONFIG_POSIX' in config_host tests +=3D { 'test-crypto-tlscredsx509': ['crypto-tls-x509-helpers.c', 'pkix_asn1= _tab.c', - tasn1, crypto], + tasn1, crypto, gnutls], 'test-crypto-tlssession': ['crypto-tls-x509-helpers.c', 'pkix_asn1_t= ab.c', 'crypto-tls-psk-helpers.c', - tasn1, crypto], + tasn1, crypto, gnutls], 'test-io-channel-tls': ['io-channel-helpers.c', 'crypto-tls-x509-hel= pers.c', 'pkix_asn1_tab.c', - tasn1, io, crypto]} + tasn1, io, crypto, gnutls]} endif if 'CONFIG_AUTH_PAM' in config_host tests +=3D {'test-authz-pam': [authz]} diff --git a/ui/meson.build b/ui/meson.build index 013258a01c..e6655c94a6 100644 --- a/ui/meson.build +++ b/ui/meson.build @@ -29,7 +29,7 @@ vnc_ss.add(files( 'vnc-ws.c', 'vnc-jobs.c', )) -vnc_ss.add(zlib, png, jpeg) +vnc_ss.add(zlib, png, jpeg, gnutls) vnc_ss.add(when: sasl, if_true: files('vnc-auth-sasl.c')) softmmu_ss.add_all(when: vnc, if_true: vnc_ss) softmmu_ss.add(when: vnc, if_false: files('vnc-stubs.c')) --=20 2.29.2