From patchwork Thu Sep 7 12:59:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1830917 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=euynrRY8; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4RhKV61Pnrz1ygc for ; Thu, 7 Sep 2023 23:15:10 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qeEdQ-0003Mp-2n; Thu, 07 Sep 2023 09:01:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qeEd6-0002sj-Iw for qemu-devel@nongnu.org; Thu, 07 Sep 2023 09:01:05 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qeEd2-0007Jh-B1 for qemu-devel@nongnu.org; Thu, 07 Sep 2023 09:01:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1694091658; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=MjIkCF5qgOZQn7olwlUoun7cKywGIXhs+Hi0nn+kw18=; b=euynrRY8PKuPVpHT1dB8MBYgehNDJOoXVWx3Wd4mZsJUEUw0IExhv9PsOFA7nJ/4OwWU+u uIBpYpokdk1AhLdHI1fA+x2QlsWJXF3hDSq+jouzmlTjcLAsROtmTiHJcPMMf0+jmBitLa vQx21xrSmYJXSQr/KMzp3yxTIkePzlU= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-624-yCwsWAd_OveSJMBfVWCHEA-1; Thu, 07 Sep 2023 09:00:56 -0400 X-MC-Unique: yCwsWAd_OveSJMBfVWCHEA-1 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-401c4f03b00so7062125e9.1 for ; Thu, 07 Sep 2023 06:00:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1694091654; x=1694696454; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MjIkCF5qgOZQn7olwlUoun7cKywGIXhs+Hi0nn+kw18=; b=ePS7yStu38sa2WcmgtD4kHT9Ua8P2HofOfzH/crzIeQc0W4QaJM5ywqT5vhvf43ds2 Dwud6mpxyx4Yqz0A1P2fu87Na98Zgb1ZfTLEF/0CH6d5hpZfn2/z9zRP4Ovakisv0Ppq vdRJ5ec+hCAmiwHQ/YUkPRNZftGi9/Q7H9CPN+h7bWY5334VcpaLppiMS8r2HEuJe1mL PqWvJpaE9XGcsBiRtQFkyIZAYIZCTLuv/TQ3Ga5Ye2m2HBWhSlh5/Iego1CCb/oSCmNL JycYCx7amI6GkvQoGhqNsHtcActpnrchpZBoowfKdvwjiRDvJj26uajMBHxSsIvIOHAn +y2A== X-Gm-Message-State: AOJu0YyexvfJkTIVRi2P0Mrvh7IniYbnI+Zs4r4pdks0AASodh5n1+uX Lp2hR2mPQwglHFrRxv6Jf16V0HDRfx3hwOV9lQmJQhdkBuC2UQROWHPTCWXIqHjwztKHYJlI+zr fV4DVrR8R66JvmzI+0LDlyVeYe2jR9TtwNiEerx8v0P7J6viSWCJ384QGpOKNbYZL/acNm+q/yG c= X-Received: by 2002:a05:600c:245:b0:400:2dc5:1fed with SMTP id 5-20020a05600c024500b004002dc51fedmr4739926wmj.33.1694091653833; Thu, 07 Sep 2023 06:00:53 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHlc5opgKDaGAwC5ssDpVmYSpwoZ//r5v6uf8mt7S6YHZlGMFeJbv7hlywVo1ulisVW04cEuw== X-Received: by 2002:a05:600c:245:b0:400:2dc5:1fed with SMTP id 5-20020a05600c024500b004002dc51fedmr4739903wmj.33.1694091653533; Thu, 07 Sep 2023 06:00:53 -0700 (PDT) Received: from [192.168.1.174] ([151.48.237.81]) by smtp.gmail.com with ESMTPSA id c19-20020a05600c0ad300b003fe2bea77ccsm2212848wmr.5.2023.09.07.06.00.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Sep 2023 06:00:52 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= Subject: [PULL 20/51] meson: do not unnecessarily use cmake for dependencies Date: Thu, 7 Sep 2023 14:59:29 +0200 Message-ID: <20230907130004.500601-21-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230907130004.500601-1-pbonzini@redhat.com> References: <20230907130004.500601-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com 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_H3=0.001, RCVD_IN_MSPIKE_WL=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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Both gvnc and sysprof-capture come with pkg-config files, so specify the method to find them. Reviewed-by: Daniel P. Berrangé Signed-off-by: Paolo Bonzini --- tests/migration/meson.build | 2 +- tests/qtest/meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/migration/meson.build b/tests/migration/meson.build index ac71f132901..a91aa61c659 100644 --- a/tests/migration/meson.build +++ b/tests/migration/meson.build @@ -1,4 +1,4 @@ -sysprof = dependency('sysprof-capture-4', required: false) +sysprof = dependency('sysprof-capture-4', method: 'pkg-config', required: false) glib_static = dependency('glib-2.0', version: glib_req_ver, required: false, method: 'pkg-config', static: true) diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build index b071d400b37..df63909ee51 100644 --- a/tests/qtest/meson.build +++ b/tests/qtest/meson.build @@ -321,7 +321,7 @@ qtests = { } if vnc.found() - gvnc = dependency('gvnc-1.0', required: false) + gvnc = dependency('gvnc-1.0', method: 'pkg-config', required: false) if gvnc.found() qtests += {'vnc-display-test': [gvnc]} qtests_generic += [ 'vnc-display-test' ]