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 X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 710A3C07E9B for ; Tue, 6 Jul 2021 15:00:51 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id F1E8F61A3E for ; Tue, 6 Jul 2021 15:00:50 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F1E8F61A3E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:52874 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0mZ8-0007aE-0S for qemu-devel@archiver.kernel.org; Tue, 06 Jul 2021 11:00:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33214) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0mX0-0004ez-CS for qemu-devel@nongnu.org; Tue, 06 Jul 2021 10:58:38 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:45750) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mWt-000237-FB for qemu-devel@nongnu.org; Tue, 06 Jul 2021 10:58:38 -0400 Received: by mail-wr1-x42f.google.com with SMTP id i8so13547589wrp.12 for ; Tue, 06 Jul 2021 07:58:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=X6XYeRZ0RRlPFd/72iPoC9h0a9yGfi2XY4pmA13N9sM=; b=CbXCJ8YaRX3KP6VPziblomeo/5M4vdKJnHQcMifN9E/vdwt7f2sFyCi95J9ezyoTxp 7C3aie32E6eAcevr2n2HQWkxbuivXWyjmXaiWC2jvHW/wsxq/pyt4gk3W3ntpRpot4GI ea3ofLjSosMuUBF6B1NkKltw+HkgntAfWDBFTr3/jdku3TdacSKhn9PAjdyjxSI87urS VvDQlj8JxW55+kdoagG4BtehDKMKn+EnHEdjaxAaAcjhoAHW5dL1ax2YPmew6RjqXUvG pikVRLwvorjqTCcXrhhS7gyToQovVrenvc/gLFG3Od3LyAKGFB0mFivp4cA3GrsPwl09 agTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=X6XYeRZ0RRlPFd/72iPoC9h0a9yGfi2XY4pmA13N9sM=; b=tHCh6WhxjZ4Sq8+9oHDDxfAQGFCm1sUQaEIewsOAkfBmjMn21yOULNw8dseCtTQWH5 Uulc0GofVp7JH/oxCByypEzmJJzLBM/vp6uC3lA0q0wg1X9tmTRb/2InvKTy6OrEBAhI HEqQbqBj0EA8KH8HWNwAZ5FyzLxCpLV5bowjH3q1P3T2ET1zicrHJJJJzT8EiPLFhwa6 cZBwNwpLWjyQu4ygmBaQ5IeppHXn8KH/c8SKAGoSH9LhqSPEbhEKK3ubGn8ELV/7gYHP m/WZu6fy2AfDj6fovh46XUh84EU6N34oXJoU77F7bYXsdM8RaDlFzbE5XJvSsLCCRQ5r wUUA== X-Gm-Message-State: AOAM530jNHICR++7JVU0OjQUMAcnzhBT9IwleYPuUz+RHrLnd/knhGfZ wA86X1N9EG9PBcmGDbaxEaMahg== X-Google-Smtp-Source: ABdhPJy4VEaRNKXTBt2ilSWrVEWTjfWY3vh/yBqVRrfi9wheR9tAFFdAvqn9lOpogEDAxR4EqTcq0A== X-Received: by 2002:a5d:5088:: with SMTP id a8mr19996266wrt.153.1625583505222; Tue, 06 Jul 2021 07:58:25 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id c1sm16964984wrp.94.2021.07.06.07.58.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 07:58:21 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 67E761FF92; Tue, 6 Jul 2021 15:58:18 +0100 (BST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 06/39] build: validate that system capstone works before using it Date: Tue, 6 Jul 2021 15:57:44 +0100 Message-Id: <20210706145817.24109-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42f.google.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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: fam@euphon.net, Thomas Huth , berrange@redhat.com, f4bug@amsat.org, Willian Rampazzo , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Daniel P. Berrangé Some versions of capstone have shipped a broken pkg-config file which puts the -I path without the trailing '/capstone' suffix. This breaks the ability to "#include ". Upstream and most distros have fixed this, but a few stragglers remain, notably FreeBSD. Signed-off-by: Daniel P. Berrangé Reviewed-by: Thomas Huth Reviewed-by: Willian Rampazzo Message-Id: <20210625172211.451010-2-berrange@redhat.com> Signed-off-by: Alex Bennée --- meson.build | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/meson.build b/meson.build index 7e12de01be..2748721d71 100644 --- a/meson.build +++ b/meson.build @@ -1641,6 +1641,19 @@ if capstone_opt in ['enabled', 'auto', 'system'] kwargs: static_kwargs, method: 'pkg-config', required: capstone_opt == 'system' or capstone_opt == 'enabled' and not have_internal) + + # 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 ', + dependencies: [capstone]) + capstone = not_found + if capstone_opt == 'system' + error('system capstone requested, it it does not appear to work') + endif + endif + if capstone.found() capstone_opt = 'system' elif have_internal -- 2.20.1