From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B7535C4332F for ; Tue, 15 Nov 2022 01:24:20 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ouinN-0007aZ-Gr; Mon, 14 Nov 2022 18:23:17 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ouifd-0002E1-2Z for qemu-devel@nongnu.org; Mon, 14 Nov 2022 18:15:19 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ouY9e-0002dQ-8e for qemu-devel@nongnu.org; Mon, 14 Nov 2022 07:01:35 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1668427292; h=from:from:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:in-reply-to:in-reply-to: references:references; bh=ZTe2u3nPv41zOdZiuII3ib/dq56dqwWZ9nCF9HyHqkw=; b=X1AwG2pUIbvHSLf4Fw6VOlHqoCNZKudEyTuBRKKNjPCO+nAS68idxRUBtac/EYVkTpVIOl Oju/KK9ZXE91wv/x63yG/92xTKbYF+5OqEG+9vhbGvN7KPT1hC6o5AcVGFiYicPspaBXNl Tcf/0P5rdKRpI5q5cELXM93s1dj1MhQ= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-20-NiDAMouyPrOk8-lSXxNSYw-1; Mon, 14 Nov 2022 07:01:28 -0500 X-MC-Unique: NiDAMouyPrOk8-lSXxNSYw-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6BD8838164C6; Mon, 14 Nov 2022 12:01:28 +0000 (UTC) Received: from redhat.com (unknown [10.33.36.135]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9C924492B05; Mon, 14 Nov 2022 12:01:27 +0000 (UTC) Date: Mon, 14 Nov 2022 12:01:22 +0000 From: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= To: Peter Maydell Cc: Michael Tokarev , qemu-devel@nongnu.org, Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= Subject: Re: [PATCH v2] capstone: use instead of Message-ID: References: <20221113200942.18882-1-mjt@msgid.tls.msk.ru> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/2.2.7 (2022-08-07) X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 Received-SPF: pass client-ip=170.10.133.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On Mon, Nov 14, 2022 at 11:59:31AM +0000, Peter Maydell wrote: > On Sun, 13 Nov 2022 at 20:10, Michael Tokarev wrote: > > > > The upcoming capstone 5.0 drops support for the old way > > of including its header, due to this change: > > https://github.com/capstone-engine/capstone/commit/6656bcb63ab4e87dc6079bd6b6b12cc8dd9b2ad8 > > The official way is to use > > > > This change has already been proposed before, see > > https://patchwork.kernel.org/project/qemu-devel/patch/20180215173539.11033-1-f4bug@amsat.org/ > > but it didn't find its way into qemu at that time. > > > > On current systems, using works > > now (despite the pkg-config-supplied -I/usr/include/capstone) - > > since on all systems capstone headers are put into capstone/ > > subdirectory of a system include dir. So this change is > > compatible with both the obsolete way of including it > > and the only future way. > > That's only true if capstone happened to be installed > into a system include directory subdirectory. That > is probably true for most distros, but it isn't > necessarily true when an end user has built and > installed capstone locally themselves. > > In other words, this is a breaking non-back-compatible > change by capstone upstream, which we now need to work > around somehow :-( > > > > diff --git a/include/disas/capstone.h b/include/disas/capstone.h > > index e29068dd97..d8fdc5d537 100644 > > --- a/include/disas/capstone.h > > +++ b/include/disas/capstone.h > > @@ -3,7 +3,7 @@ > > > > #ifdef CONFIG_CAPSTONE > > > > -#include > > +#include > > > > #else > > > > diff --git a/meson.build b/meson.build > > index cf3e517e56..6f34c963f7 100644 > > --- a/meson.build > > +++ b/meson.build > > @@ -2680,12 +2680,7 @@ if not get_option('capstone').auto() or have_system or have_user > > capstone = dependency('capstone', version: '>=3.0.5', > > kwargs: static_kwargs, method: 'pkg-config', > > required: get_option('capstone')) > > - > > - # Some versions of capstone have broken pkg-config file > > - # that reports a wrong -I path, causing the #include to > > - # fail later. If the system has such a broken version > > - # do not use it. > > - if capstone.found() and not cc.compiles('#include ', > > + if capstone.found() and not cc.compiles('#include ', > > dependencies: [capstone]) > > capstone = not_found > > if get_option('capstone').enabled() > > We can do something like > > config_host_data.set('HAVE_CAPSTONE_CAPSTONE_H', > cc.has_header('capstone/capstone.h', depedencies: [capstone]) > > to check that this capstone really does have capstone/capstone.h, > for instance. > > Dan: is there a reason why in commit 8f4aea712ffc4 you wrote > the "check that capstone.h really exists" check with cc.compiles > rather than cc.has_header ? I was probably just unaware of 'has_header' existing With regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|