From patchwork Wed Nov 8 18:32:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 13450392 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 11B99C4167D for ; Wed, 8 Nov 2023 18:34:03 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r0nMP-0007RN-Ou; Wed, 08 Nov 2023 13:33:05 -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 1r0nMO-0007Qu-D5 for qemu-devel@nongnu.org; Wed, 08 Nov 2023 13:33:04 -0500 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r0nMM-0002xK-OM for qemu-devel@nongnu.org; Wed, 08 Nov 2023 13:33:04 -0500 Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-32f7c44f6a7so4252542f8f.1 for ; Wed, 08 Nov 2023 10:33:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1699468381; x=1700073181; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=viJPlpU3vzxbCgCk3OGKl1HnEwyjYeL1NL/uBJdjxBI=; b=Yie5K7JUAkhkUHsiojXPuKnl/snW/A1GMbQeMLyiA1qouIPQz6fB2W8xwTzPKtmUqI u9VEJGWclU1OW9FKG7jZbVi+XAhcwmu1tPeTt1l5k2gWTl7T3YcdIOIdDsYcl7mdjFow bCE7ZW4WyCUHY+o8+civgxJtNKolsLo/pTLnSq3fkEt+0EP18fqXzz58RTQuNrYJv29s 1BGOzKW6phZKlok7wJDsO7QVk4je2n2KDKr+w1ucHY6/Prd1QkyEO/dfk17drwJ6b2RZ +3f9p8HbNGU+aef7HgzJRrs+y1yvYQIu4rofpy/k4wse+vDVNcztyEZW+BPqDE/vg6dY rshw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699468381; x=1700073181; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=viJPlpU3vzxbCgCk3OGKl1HnEwyjYeL1NL/uBJdjxBI=; b=kezGu5MBlN0V3m/uQ2zz04tGLBRI/Ytqzl+FybvjRZG+H8ltduVuJnWjdz+bIR4C3o 175ZEGrq4QhW5eJGpkiYJlNMds60VfQC5NuZjUFGf/x48dlq2Z7Fbw4STs6Tojw5aSF1 oK0EHoaTBCemrJNmt+xSvw/NUJfDN/4k+vUZ+8cc2liTskCVY8mZhHXnvqcZcc433iVl Fe0gSqv6O/96lsEuHWSCTBkxldszrLmXqhhT45vJTghCek/V8fE9SpU3H5krJPXfwAF6 tkQOWbuNoCMQprZjnppVf4IeV9tRHZM/XpH8ZsRYYrBU0VwC/At8Er53vst05bk3nZwu ILeQ== X-Gm-Message-State: AOJu0YywkbjBR1QMmBGXIvlzw8mnkwm23gs7uaX/m6GpSlxo4vsvRQFD ZpqSq5OaCHupAw/Rvp/pDmFDJD7YdrQ/zpuVHVg= X-Google-Smtp-Source: AGHT+IE59wbPvgVnbA1Dwt75BV1AIqQf1/OLk/OHqxO4DdL0qR7TNaX95C7XCleLT5uUh8RTb78nuQ== X-Received: by 2002:a05:6000:402c:b0:32f:79e5:8109 with SMTP id cp44-20020a056000402c00b0032f79e58109mr2281480wrb.2.1699468380703; Wed, 08 Nov 2023 10:33:00 -0800 (PST) Received: from m1x-phil.lan ([176.187.199.60]) by smtp.gmail.com with ESMTPSA id g16-20020a5d5550000000b0032de6f95fb3sm5487253wrw.40.2023.11.08.10.32.58 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 08 Nov 2023 10:33:00 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Paolo Bonzini , John Snow Cc: =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , Wainer dos Santos Moschetta , =?utf-8?q?Philippe_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= , Rene Engel , Peter Maydell , =?utf-8?q?Alex_Benn=C3=A9e?= , Beraldo Leal , Thomas Huth , Howard Spoelstra Subject: [NOTFORMERGE PATCH 1/2] configure: Use distrib meson Date: Wed, 8 Nov 2023 19:32:50 +0100 Message-ID: <20231108183251.80572-2-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231108183251.80572-1-philmd@linaro.org> References: <20231108183251.80572-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=philmd@linaro.org; helo=mail-wr1-x429.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, T_SCC_BODY_TEXT_LINE=-0.01 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: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Signed-off-by: Philippe Mathieu-Daudé --- configure | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/configure b/configure index f1456f6123..93735b7661 100755 --- a/configure +++ b/configure @@ -955,15 +955,8 @@ if $python -c 'import sys; sys.exit(sys.version_info >= (3,11))'; then $mkvenv ensure --dir "${source_path}/python/wheels" \ 'tomli>=1.2.0' || exit 1 fi -$mkvenv ensuregroup --dir "${source_path}/python/wheels" \ - ${source_path}/pythondeps.toml meson || exit 1 -# At this point, we expect Meson to be installed and available. -# We expect mkvenv or pip to have created pyvenv/bin/meson for us. -# We ignore PATH completely here: we want to use the venv's Meson -# *exclusively*. - -meson="$(cd pyvenv/bin; pwd)/meson" +meson="$(which meson)" # Conditionally ensure Sphinx is installed.