From nobody Mon Feb 9 20:31:55 2026 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=1600273664; cv=none; d=zohomail.com; s=zohoarc; b=apIi6vAUVqn8XuyFNCWWjfC3jELGQi4pVxvZxuGQRg1B0Yf3uILbb+crOG1Im8jWZ1vTa5GhOKXrSjbx1CQ0T6hIr52alKbH/8bjfTcZ6Tk2Dhzzn4WnRY//AQuV8JuILQbS5tTlk8SyxSOlqrlFYDLeTKrt0jn8C4XtTbJgzTg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600273664; h=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=iMSNpRYkuxORHU6f+AgXIb0a+Cm9/6sUG5ZTlxMixc8=; b=eIE0jKgAuXUHYAkS1zP2ct2hUscYQfVLhmqoc/SwFkpnvALus4XwJqlovx9bpfC0q/ZIA0qgqCTccdcVAVO4QpGpTtKFnryU4XLXFcK+y49Ed11WseKki09tYtgbWnOuOS7lx0LOewRip/ke8opqphBimwMu24uPh33mEG93N0Y= 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 1600273664109502.7889238141436; Wed, 16 Sep 2020 09:27:44 -0700 (PDT) Received: from localhost ([::1]:45406 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kIaHW-00049l-UR for importer@patchew.org; Wed, 16 Sep 2020 12:27:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53790) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kIaGL-0003I3-I9 for qemu-devel@nongnu.org; Wed, 16 Sep 2020 12:26:29 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:45278) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kIaGJ-0000oc-IT for qemu-devel@nongnu.org; Wed, 16 Sep 2020 12:26:29 -0400 Received: by mail-wr1-x429.google.com with SMTP id x14so7524434wrl.12 for ; Wed, 16 Sep 2020 09:26:26 -0700 (PDT) Received: from localhost.localdomain ([2001:b07:6468:f312:cf8e:a9a0:1aed:9a37]) by smtp.gmail.com with ESMTPSA id v128sm6111933wme.2.2020.09.16.09.26.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Sep 2020 09:26:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=iMSNpRYkuxORHU6f+AgXIb0a+Cm9/6sUG5ZTlxMixc8=; b=fh6/sBm4DHwFK8qczrd19K1rHUAZFiXExf8NAZWMHCO/nnyZ5QrOEiFAGabfQeuinD xkgPHxcfrj4EdUalmW0Jkzl3GHtlMXQgpqbsb6FPRXT0nV2Mu/XnBczT84DDH4CL2oXu W8ny3m4uUg/kCZMMLDl5EKA8+iwkgFnlJiRdRs9OXx03RbEyCeg/Vx8Y3cCZp7JbujeK Npy7hvDcJhMygcmazVZtMSWxcfabUo6viEUoJOZh1tWeVio9w/C6Xvx7JIcAoRPmXefr j5waV6mPhkM+CcIW/8YfSSTP7WJ5h44ZIFhUwOL4dCE1Ct9WR1N8JhH7yd4+kb7AUQYB nxnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=iMSNpRYkuxORHU6f+AgXIb0a+Cm9/6sUG5ZTlxMixc8=; b=iTSU/syq9G53nS9voA9fMsjLFR0u9va452BrLfBfOV+Icj9QZGu7GB+Ho2u7o0TdpF dc6i2TaU/FppGwzFzr2JNMunB9o+mpfPcXnZ8mQtykBiAFCQLqYvlYE1ZPJvO6BLJBwy Robhc5ckvgjBBuYjvbH4ct1ax6AYMYsm7Ac7ZICKCDyUcLxKBAGSjFeOscSymydCW0N8 +1GaiF2kzheUA2+MeWQMswOCBulSNFhuruvqamqkSe636jpx9eFgTZhtfixQIrmROnRm IYpyPT/IdPmdtWXtlHxF+RDrX+ZYiiUJipQUXkdV/rqyU4SryPQdn8q+Dd5xxMU+CGOd U3Pg== X-Gm-Message-State: AOAM532LLQkNf72yedYuNXkAqNdRKPDEhdXPgJodpvfnJiZtmJCeQ+cl JL2XayGVbomMr2bivwEHVQHyKoluPl4= X-Google-Smtp-Source: ABdhPJwTOEQrrWrtifFPglwcwuyAbFDXF7cCiohkzLgcIU0WSL+k7h/ge8ey2vXCjUUU5RaWVK+rXA== X-Received: by 2002:a5d:55c8:: with SMTP id i8mr28060213wrw.331.1600273584748; Wed, 16 Sep 2020 09:26:24 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 1/2] meson: move libudev test Date: Wed, 16 Sep 2020 18:26:20 +0200 Message-Id: <20200916162621.100141-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200916162621.100141-1-pbonzini@redhat.com> References: <20200916162621.100141-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::429; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x429.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: fail (Header signature does not verify) 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 1a86c1f146..83ccbc6d70 100755 --- a/configure +++ b/configure @@ -876,7 +876,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 @@ -6258,15 +6257,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 @@ -7435,10 +7425,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 64c0058dfb..5092aec439 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()) @@ -1527,7 +1528,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