From nobody Sun May 19 02:38:06 2024 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=1598425421; cv=none; d=zohomail.com; s=zohoarc; b=n5ewOXYPMCAtxvxFSKmZpvWGY4YcgSX1ZtMxVbJ5Tu+FYmrj9ybegj2A5Ud+9SKBTk+bqJMwSLcLgb5Mnnsg9YsKKl7R3xh+KPt5e/RIZEEKjPPvnCVcYZMi8Il6+04thUfMTa9hCIqqBchL/+oZh6CHqG/+4w3YLc/PMdaiZAc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598425421; 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=yO+hYHNv7RU0SPtT+0fMDBg6NRqJbbbdGUkFd0TI1zs=; b=Yl9gl8uadOr3N6suQXLuVa5KlxAbiiE8u9iRwQiLwBs3r/siNEfuEA/IMxddC39VoO7qnuYW1avoOWZkoFSH91JurTC33jahtnWp/c5Qh97q/qhsWMUd4/+3jJKRDwZcpaU4Ba3XyfnsQXJmVntSgybZaORmILYMoKZ2HM37M4w= 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 1598425421549369.05017104008425; Wed, 26 Aug 2020 00:03:41 -0700 (PDT) Received: from localhost ([::1]:44090 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kApTA-0007Jv-2B for importer@patchew.org; Wed, 26 Aug 2020 03:03:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43786) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kApSQ-000635-Tl for qemu-devel@nongnu.org; Wed, 26 Aug 2020 03:02:54 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:20212) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kApSO-00051p-V1 for qemu-devel@nongnu.org; Wed, 26 Aug 2020 03:02:54 -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-231-lrWqcBE6O5SScg4LJ3Wt7w-1; Wed, 26 Aug 2020 03:02:45 -0400 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 C0EB78030D9; Wed, 26 Aug 2020 07:02:44 +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 603B1702F5; Wed, 26 Aug 2020 07:02:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598425371; 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=yO+hYHNv7RU0SPtT+0fMDBg6NRqJbbbdGUkFd0TI1zs=; b=aPf4BjipUQiy/1RHohDnRQoff4tYhaU7O7RxNMXOC3n4W5PkeajwXdQGCBKKTpWuKotFaw X2XUZSAVbenCjCZzgv2FifiQLkFSpmEVdzw8xqNJhfhu9i4MO+LqSR1ZgEH38hsKM2ClbR 23ZWjw45D3CFFYxX3wjGq/ZShY4W+Fg= X-MC-Unique: lrWqcBE6O5SScg4LJ3Wt7w-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH] meson: move pixman detection to meson Date: Wed, 26 Aug 2020 03:02:43 -0400 Message-Id: <20200826070243.11969-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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-Type: text/plain; charset="utf-8" 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=216.205.24.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/25 23:30:47 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.958, 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_H5=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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thuth@redhat.com, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Rafael Kitover Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) When pixman is not installed (or too old), but virglrenderer is available and "configure" has been run with "--disable-system", the build currently aborts when trying to compile vhost-user-gpu (since it requires pixman). Let's skip the build of vhost-user-gpu when pixman is not installed or too old. Instead of adding CONFIG_PIXMAN, it is simpler to move the detection to pixman. Based on a patch by Thomas Huth. Fixes: 9b52b17ba5 ("configure: Allow to build tools without pixman") Reported-by: Rafael Kitover Reported-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Paolo Bonzini Reviewed-by: Thomas Huth --- configure | 21 ++------------------- contrib/vhost-user-gpu/meson.build | 3 ++- meson.build | 12 +++++++----- 3 files changed, 11 insertions(+), 25 deletions(-) diff --git a/configure b/configure index a5fa472c64..51b6164f69 100755 --- a/configure +++ b/configure @@ -3923,20 +3923,6 @@ if test "$modules" =3D yes; then fi fi =20 -########################################## -# pixman support probe - -if test "$softmmu" =3D "no"; then - pixman_cflags=3D - pixman_libs=3D -elif $pkg_config --atleast-version=3D0.21.8 pixman-1 > /dev/null 2>&1; then - pixman_cflags=3D$($pkg_config --cflags pixman-1) - pixman_libs=3D$($pkg_config --libs pixman-1) -else - error_exit "pixman >=3D 0.21.8 not present." \ - "Please install the pixman devel package." -fi - ########################################## # libmpathpersist probe =20 @@ -6649,8 +6635,8 @@ echo_version() { fi } =20 -# prepend pixman and ftd flags after all config tests are done -QEMU_CFLAGS=3D"$pixman_cflags $fdt_cflags $QEMU_CFLAGS" +# prepend ftd flags after all config tests are done +QEMU_CFLAGS=3D"$fdt_cflags $QEMU_CFLAGS" QEMU_LDFLAGS=3D"$fdt_ldflags $QEMU_LDFLAGS" =20 config_host_mak=3D"config-host.mak" @@ -8053,9 +8039,6 @@ fi =20 done # for target in $targets =20 -echo "PIXMAN_CFLAGS=3D$pixman_cflags" >> $config_host_mak -echo "PIXMAN_LIBS=3D$pixman_libs" >> $config_host_mak - if [ "$fdt" =3D "git" ]; then subdirs=3D"$subdirs dtc" fi diff --git a/contrib/vhost-user-gpu/meson.build b/contrib/vhost-user-gpu/me= son.build index 8df4c13bc5..7d9b29da8b 100644 --- a/contrib/vhost-user-gpu/meson.build +++ b/contrib/vhost-user-gpu/meson.build @@ -1,5 +1,6 @@ if 'CONFIG_TOOLS' in config_host and 'CONFIG_VIRGL' in config_host \ - and 'CONFIG_GBM' in config_host and 'CONFIG_LINUX' in config_host + and 'CONFIG_GBM' in config_host and 'CONFIG_LINUX' in config_host \ + and pixman.found() executable('vhost-user-gpu', files('vhost-user-gpu.c', 'virgl.c', 'vugbm= .c'), link_with: libvhost_user, dependencies: [qemuutil, pixman, gbm, virgl], diff --git a/meson.build b/meson.build index bcd39b39da..57c2fe2b65 100644 --- a/meson.build +++ b/meson.build @@ -114,8 +114,11 @@ if 'CONFIG_GNUTLS' in config_host gnutls =3D declare_dependency(compile_args: config_host['GNUTLS_CFLAGS']= .split(), link_args: config_host['GNUTLS_LIBS'].split(= )) endif -pixman =3D declare_dependency(compile_args: config_host['PIXMAN_CFLAGS'].s= plit(), - link_args: config_host['PIXMAN_LIBS'].split()) +pixman =3D not_found +if have_system or have_tools + pixman =3D dependency('pixman', required: have_system, version:'>=3D0.21= .8', + static: enable_static) +endif pam =3D not_found if 'CONFIG_AUTH_PAM' in config_host pam =3D cc.find_library('pam') @@ -1094,9 +1097,7 @@ if have_tools if 'CONFIG_VHOST_USER' in config_host subdir('contrib/libvhost-user') subdir('contrib/vhost-user-blk') - if 'CONFIG_LINUX' in config_host - subdir('contrib/vhost-user-gpu') - endif + subdir('contrib/vhost-user-gpu') subdir('contrib/vhost-user-input') subdir('contrib/vhost-user-scsi') endif @@ -1303,6 +1304,7 @@ summary_info +=3D {'SDL image support': sdl_image.fou= nd()} # TODO: add back version summary_info +=3D {'GTK support': config_host.has_key('CONFIG_GTK')} summary_info +=3D {'GTK GL support': config_host.has_key('CONFIG_GTK_GL= ')} +summary_info +=3D {'pixman': pixman.found()} # TODO: add back version summary_info +=3D {'VTE support': config_host.has_key('CONFIG_VTE')} summary_info +=3D {'TLS priority': config_host['CONFIG_TLS_PRIORITY']} --=20 2.26.2