From nobody Sun Nov 16 14:30:27 2025 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=1600533154; cv=none; d=zohomail.com; s=zohoarc; b=hmmcOUM22pnT+piLm6UyTSqiQdm9DP6mL6z5Jw8d1otir1HYcUtRK2wjLftc/XNCvnNF+BVjTIXfsKexa7yETyCHOyW/1lqsYpo4bZ4VGNBLF5N+lvXuLmchA1dJHUwcZf1gWaM2QhWBFyXOyrIodNZmUpRGkRFTBh3M9CihWkA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600533154; h=Content-Type:Content-Transfer-Encoding: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=jEzYWG86cyeKXmIpAXs/dJ9Zr+7t46gORXBFadvyXd0=; b=KovlTxbE6hRQ04GmktNVJxbcA93hCT7x8FrCoJBDebIsug1UL9EEnUwEfW2Qdi2EaJl/snzdh2MAnQMJxXs7d9ehAqvR24LdyJZQiXPZ1TB1xLxHLw+W/7LIdg8T9ZXtPZY7AF+SEjuYQ02tjTrOmp+TWmhQ0yp7DqS9dRg5oPo= 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 1600533154185202.37053808734981; Sat, 19 Sep 2020 09:32:34 -0700 (PDT) Received: from localhost ([::1]:36978 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kJfmq-0003dH-Tc for importer@patchew.org; Sat, 19 Sep 2020 12:32:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51556) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kJfHP-0005Vy-HP for qemu-devel@nongnu.org; Sat, 19 Sep 2020 12:00:03 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:21206) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kJfH7-0007PE-Tj for qemu-devel@nongnu.org; Sat, 19 Sep 2020 12:00:02 -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-21-K2P5L0N9PnK-fJGBUzrodw-1; Sat, 19 Sep 2020 11:59:43 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 27DF256BF2 for ; Sat, 19 Sep 2020 15:59:42 +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 E6FD210016DA for ; Sat, 19 Sep 2020 15:59:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600531185; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jEzYWG86cyeKXmIpAXs/dJ9Zr+7t46gORXBFadvyXd0=; b=Ep5tKfR4tyzNNQN3gcbE/1NuQZ22lcTcYeYCmxXdDoG6qZgcVB+q910yr3eUJfl6aZ2zzI aIx1iBxmL7lRFjQ2LcbiLS5yHmW4jOcBDe3e7WjvZ0Lqkl+ra//GoTNafMmIhrJ8fxHAxn S5HA6wjkhxprH3kizyJk/Y9+T/a0Rmg= X-MC-Unique: K2P5L0N9PnK-fJGBUzrodw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 31/57] meson: move libudev test Date: Sat, 19 Sep 2020 11:58:50 -0400 Message-Id: <20200919155916.1046398-32-pbonzini@redhat.com> In-Reply-To: <20200919155916.1046398-1-pbonzini@redhat.com> References: <20200919155916.1046398-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 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=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/09/19 06:41:51 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -50 X-Spam_score: -5.1 X-Spam_bar: ----- X-Spam_report: (-5.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.996, 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: , 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" Signed-off-by: Paolo Bonzini --- configure | 14 -------------- meson.build | 7 ++++--- 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/configure b/configure index 6201e7c732..4a7f577f49 100755 --- a/configure +++ b/configure @@ -901,7 +901,6 @@ Linux) linux_user=3D"yes" kvm=3D"yes" QEMU_INCLUDES=3D"-isystem ${source_path}/linux-headers -Ilinux-headers $= QEMU_INCLUDES" - libudev=3D"yes" ;; esac =20 @@ -6282,15 +6281,6 @@ if test "$libnfs" !=3D "no" ; then fi =20 ########################################## -# Do we have libudev -if test "$libudev" !=3D "no" ; then - if $pkg_config libudev && test "$static" !=3D "yes"; then - libudev=3D"yes" - libudev_libs=3D$($pkg_config --libs libudev) - else - libudev=3D"no" - fi -fi =20 # Exclude --warn-common with TSan to suppress warnings from the TSan libra= ries. if test "$solaris" =3D "no" && test "$tsan" =3D "no"; then @@ -7459,10 +7449,6 @@ if test "$gcov" =3D "yes" ; then echo "CONFIG_GCOV=3Dy" >> $config_host_mak fi =20 -if test "$libudev" !=3D "no"; then - echo "CONFIG_LIBUDEV=3Dy" >> $config_host_mak - echo "LIBUDEV_LIBS=3D$libudev_libs" >> $config_host_mak -fi if test "$fuzzing" !=3D "no"; then echo "CONFIG_FUZZ=3Dy" >> $config_host_mak fi diff --git a/meson.build b/meson.build index 5ab9a4dd1e..11213b6e8b 100644 --- a/meson.build +++ b/meson.build @@ -257,8 +257,8 @@ if 'CONFIG_CURL' in config_host link_args: config_host['CURL_LIBS'].split()) endif libudev =3D not_found -if 'CONFIG_LIBUDEV' in config_host - libudev =3D declare_dependency(link_args: config_host['LIBUDEV_LIBS'].sp= lit()) +if target_os =3D=3D 'linux' + libudev =3D dependency('libudev', static: enable_static) endif brlapi =3D not_found if 'CONFIG_BRLAPI' in config_host @@ -446,6 +446,7 @@ has_gettid =3D cc.has_function('gettid') =20 # Create config-host.h =20 +config_host_data.set('CONFIG_LIBUDEV', libudev.found()) config_host_data.set('CONFIG_SDL', sdl.found()) config_host_data.set('CONFIG_SDL_IMAGE', sdl_image.found()) config_host_data.set('CONFIG_VNC', vnc.found()) @@ -1526,7 +1527,7 @@ summary_info +=3D {'sheepdog support': config_host.h= as_key('CONFIG_SHEEPDOG')} summary_info +=3D {'capstone': config_host.has_key('CONFIG_CAPSTO= NE')} summary_info +=3D {'libpmem support': config_host.has_key('CONFIG_LIBPME= M')} summary_info +=3D {'libdaxctl support': config_host.has_key('CONFIG_LIBDAX= CTL')} -summary_info +=3D {'libudev': config_host.has_key('CONFIG_LIBUDE= V')} +summary_info +=3D {'libudev': libudev.found()} summary_info +=3D {'default devices': config_host['CONFIG_MINIKCONF_MODE= '] =3D=3D '--defconfig'} summary_info +=3D {'plugin support': config_host.has_key('CONFIG_PLUGIN= ')} summary_info +=3D {'fuzzing support': config_host.has_key('CONFIG_FUZZ')} --=20 2.26.2