From nobody Sat May 18 18:27:35 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=1598372861; cv=none; d=zohomail.com; s=zohoarc; b=aNo7/Xa65TFlHA0UqDW6tS52g5vEceNrQGv7zrGMSg0j4isYdieoZgWkjNBENlwPsfXONkh5cS8cZJTE+MULO5z+O8oMG04KpQ3c/KcfGTzxvA21nb/RLfBxIdP8nLy3s69ivRofAZy88wIs2+a0DYOizolQ7E59zwyWrH4OWBo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598372861; 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=p70MgYLFVbMqoyV7PfmUoHB3+RfBuvpZtgT4MVyxYQw=; b=futdxkX22uA5ddzSDBb2uz1j9kCmQWkWLQctphDzeMRUlrs+La7aJ2d5Ph3M1bghzX29ywOBzYo1rCpTUf/wfCA8Yd4WVIdqh174o7MKUuDfybNH0lwANi9qoZbly2jpzzNM9MiAwoyNwlgy1dKW6/YDFAVwewOrrCcsnG9cILg= 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 1598372861132982.1165677909529; Tue, 25 Aug 2020 09:27:41 -0700 (PDT) Received: from localhost ([::1]:34188 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kAbnN-0006zk-QO for importer@patchew.org; Tue, 25 Aug 2020 12:27:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50932) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAbmf-0006Vm-Os for qemu-devel@nongnu.org; Tue, 25 Aug 2020 12:26:53 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:28529 helo=us-smtp-delivery-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 1kAbmc-00085H-U5 for qemu-devel@nongnu.org; Tue, 25 Aug 2020 12:26:52 -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-216--j2S_XGJM76PfA1c42VzOg-1; Tue, 25 Aug 2020 12:26:46 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 42E45186A567; Tue, 25 Aug 2020 16:26:45 +0000 (UTC) Received: from thuth.com (ovpn-112-152.ams2.redhat.com [10.36.112.152]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2531A5C1C2; Tue, 25 Aug 2020 16:26:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598372809; 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=p70MgYLFVbMqoyV7PfmUoHB3+RfBuvpZtgT4MVyxYQw=; b=LZ8hOXZZMxiT9BJhvw0FCAGNy1R1RL2anGmAYpn12ya5mSFQDAj9AhyXqyNQV10c1g2g0v 8PiNw38DtwctgPnGYFDk1c7ARvxRuHiOOXxR3ArNIoVwxiAAeuQvtswKrVtVQV3kzSZs8c PbzQMQwB+XgHwNNgW8cWyAzZNQtlKmA= X-MC-Unique: -j2S_XGJM76PfA1c42VzOg-1 From: Thomas Huth To: Gerd Hoffmann , qemu-devel@nongnu.org Subject: [PATCH] configure / meson: Fix building with --disable-system and virglrenderer Date: Tue, 25 Aug 2020 18:26:28 +0200 Message-Id: <20200825162628.182885-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@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=205.139.110.61; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/25 01:35:36 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_H4=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: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Rafael Kitover , "Michael S. Tsirkin" 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 add a proper CONFIG_PIXMAN switch so we can skip the build of vhost-user-gpu when pixman is not installed or too old. Fixes: 9b52b17ba5 ("configure: Allow to build tools without pixman") Reported-by: Rafael Kitover Reported-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Thomas Huth --- configure | 20 +++++++++++++------- contrib/vhost-user-gpu/meson.build | 3 ++- meson.build | 12 +++++++----- 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/configure b/configure index b1e11397a8..bddda91477 100755 --- a/configure +++ b/configure @@ -3925,15 +3925,18 @@ fi ########################################## # pixman support probe =20 -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 +if $pkg_config --atleast-version=3D0.21.8 pixman-1 > /dev/null 2>&1; then + pixman=3D"yes" pixman_cflags=3D$($pkg_config --cflags pixman-1) pixman_libs=3D$($pkg_config --libs pixman-1) else + pixman=3D"no" + pixman_cflags=3D + pixman_libs=3D +fi +if test "$softmmu" =3D "yes" && test "$pixman" =3D "no"; then error_exit "pixman >=3D 0.21.8 not present." \ - "Please install the pixman devel package." + "Please install the pixman devel package or use --disable-system." fi =20 ########################################## @@ -8054,8 +8057,11 @@ 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 test "$pixman" =3D "yes"; then + echo "CONFIG_PIXMAN=3Dy" >> $config_host_mak + echo "PIXMAN_CFLAGS=3D$pixman_cflags" >> $config_host_mak + echo "PIXMAN_LIBS=3D$pixman_libs" >> $config_host_mak +fi =20 if [ "$fdt" =3D "git" ]; then subdirs=3D"$subdirs dtc" diff --git a/contrib/vhost-user-gpu/meson.build b/contrib/vhost-user-gpu/me= son.build index 6c1459f54a..142daebfd7 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 'CONFIG_PIXMAN' in config_host 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 7fbb7ab2fb..9eecea549c 100644 --- a/meson.build +++ b/meson.build @@ -113,8 +113,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 'CONFIG_PIXMAN' in config_host + pixman =3D declare_dependency(compile_args: config_host['PIXMAN_CFLAGS']= .split(), + link_args: config_host['PIXMAN_LIBS'].split(= )) +endif pam =3D not_found if 'CONFIG_AUTH_PAM' in config_host pam =3D cc.find_library('pam') @@ -1095,9 +1098,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 @@ -1278,6 +1279,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 support': config_host.has_key('CONFIG_PIXMAN= ')} # 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.18.2