From nobody Sun Feb 8 23:58:27 2026 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=1598943967; cv=none; d=zohomail.com; s=zohoarc; b=HS8DdqtRWyTEbLPVIsz69/V3nzw+5iytDFRZs3DvUwEefOJcWARHFypHudpzEfXLYwp7Apdv8u2ciT2BI15xJySB/QqvcAWZ08NTiR9EQxvY4kTKmyUYggrCVmvX4PeliE/flrUoNlhGM/WiHJGlz88C0g4b5At01YYNGrtzuxs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598943967; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=b9AKTtufJsM2KUAdKcbxs9ux5QGHnOstuHgTA3nWgas=; b=e6dtMi9ALymm3YCPPKiQxX6av400dDV1iAHB4gEXBuPqzNMdAmUrNjezBnGfBPn7RSx6ZAjeoddiZeuq7NyIRKXxAUnrvg523ODAyomhNE1mmaskJSgaK+MszsJ0FwFxcP3Q1zogUBcAd0sU0NqKFpnoBwZDo/bSuhqDgvrNG74= 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 1598943967436745.75139814729; Tue, 1 Sep 2020 00:06:07 -0700 (PDT) Received: from localhost ([::1]:40540 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kD0Mo-0004of-K9 for importer@patchew.org; Tue, 01 Sep 2020 03:06:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53084) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kD0Lx-0004Hy-0c for qemu-devel@nongnu.org; Tue, 01 Sep 2020 03:05:13 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:57944 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 1kD0Lt-000620-QS for qemu-devel@nongnu.org; Tue, 01 Sep 2020 03:05:11 -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-531-UWtKocEwOU-mJ4YTmhGSIg-1; Tue, 01 Sep 2020 03:05:04 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 39792802B75 for ; Tue, 1 Sep 2020 07:05:03 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id 19F91747B0; Tue, 1 Sep 2020 07:05:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598943908; 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; bh=b9AKTtufJsM2KUAdKcbxs9ux5QGHnOstuHgTA3nWgas=; b=E8h14iAb0OKVLtvtX5uE8S9jnc/zloWfCq7wQ1No3BGX2yPv+X6FN0xi3onWZ2VbgqiK+n 2UlauCRuPEgj2MWRc5/UYZALKVg6Pb3Fk8II51ZtK1FPoYgcM9qnL7Wz9viw+d/i40yIih S31zLtUFpW0e5JG5bL2e2eeCZfkSJpg= X-MC-Unique: UWtKocEwOU-mJ4YTmhGSIg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH v2] meson: use pkg-config method to find dependencies Date: Tue, 1 Sep 2020 03:04:59 -0400 Message-Id: <20200901070459.27489-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com 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=207.211.31.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/01 00:57:59 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: kraxel@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" We do not need to ask cmake for the dependencies, so just use the pkg-config mechanism. Keep "auto" for SDL so that it tries using sdl-config too. The documentation is adjusted to use SDL2_image as the example, rather than SDL which does not use the "pkg-config" method. Signed-off-by: Paolo Bonzini Reviewed-by: Gerd Hoffmann --- docs/devel/build-system.rst | 27 ++++++++++++++------------- meson.build | 8 ++++---- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/docs/devel/build-system.rst b/docs/devel/build-system.rst index 58bf392430..0c09fb9a54 100644 --- a/docs/devel/build-system.rst +++ b/docs/devel/build-system.rst @@ -66,46 +66,47 @@ following tasks: upon completion. =20 =20 -Taking the probe for SDL as an example, we have the following pieces +Taking the probe for SDL2_Image as an example, we have the following pieces in configure:: =20 # Initial variable state - sdl=3Dauto + sdl_image=3Dauto =20 ..snip.. =20 # Configure flag processing - --disable-gnutls) sdl=3Ddisabled + --disable-sdl-image) sdl_image=3Ddisabled ;; - --enable-gnutls) sdl=3Denabled + --enable-sdl-image) sdl_image=3Denabled ;; =20 ..snip.. =20 # Help output feature message - sdl SDL UI + sdl-image SDL Image support for icons =20 ..snip.. =20 # Meson invocation - -Dsdl=3D$sdl + -Dsdl_image=3D$sdl_image =20 In meson_options.txt:: =20 - option('sdl', type : 'feature', value : 'auto') + option('sdl', type : 'feature', value : 'auto', + description: 'SDL Image support for icons') =20 In meson.build:: =20 # Detect dependency - sdl =3D dependency('sdl2', - required: get_option('sdl'), - static: enable_static) + sdl_image =3D dependency('SDL2_image', required: get_option('sdl_image'), + method: 'pkg-config', + static: enable_static) =20 - # Create config-host.h - config_host_data.set('CONFIG_SDL', sdl.found()) + # Create config-host.h (if applicable) + config_host_data.set('CONFIG_SDL_IMAGE', sdl_image.found()) =20 # Summary - summary_info +=3D {'SDL support': sdl.found()} + summary_info +=3D {'SDL image support': sdl_image.found()} =20 =20 =20 diff --git a/meson.build b/meson.build index 78ac86f3a1..0e2d884f5c 100644 --- a/meson.build +++ b/meson.build @@ -129,7 +129,7 @@ endif pixman =3D not_found if have_system or have_tools pixman =3D dependency('pixman-1', required: have_system, version:'>=3D0.= 21.8', - static: enable_static) + method: 'pkg-config', static: enable_static) endif pam =3D not_found if 'CONFIG_AUTH_PAM' in config_host @@ -168,7 +168,7 @@ if get_option('xkbcommon').auto() and not have_system a= nd not have_tools xkbcommon =3D not_found else xkbcommon =3D dependency('xkbcommon', required: get_option('xkbcommon'), - static: enable_static) + method: 'pkg-config', static: enable_static) endif slirp =3D not_found if config_host.has_key('CONFIG_SLIRP') @@ -247,7 +247,7 @@ if sdl.found() sdl =3D declare_dependency(compile_args: '-Wno-undef', dependencies: sdl) sdl_image =3D dependency('SDL2_image', required: get_option('sdl_image'), - static: enable_static) + method: 'pkg-config', static: enable_static) else if get_option('sdl_image').enabled() error('sdl-image required, but SDL was @0@', @@ -332,7 +332,7 @@ sasl =3D not_found if get_option('vnc').enabled() vnc =3D declare_dependency() # dummy dependency png =3D dependency('libpng', required: get_option('vnc_png'), - static: enable_static) + method: 'pkg-config', static: enable_static) jpeg =3D cc.find_library('jpeg', has_headers: ['jpeglib.h'], required: get_option('vnc_jpeg'), static: enable_static) --=20 2.26.2