From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1A6A1158041 for ; Tue, 20 Feb 2024 04:33:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C39572BC023; Tue, 20 Feb 2024 04:32:41 +0000 (UTC) Received: from mail-oi1-x234.google.com (mail-oi1-x234.google.com [IPv6:2607:f8b0:4864:20::234]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8CDFB2BC020 for ; Tue, 20 Feb 2024 04:32:41 +0000 (UTC) Received: by mail-oi1-x234.google.com with SMTP id 5614622812f47-3bbd6ea06f5so2536024b6e.1 for ; Mon, 19 Feb 2024 20:32:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708403560; x=1709008360; darn=lists.gentoo.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=XDcsFixeKuMDXl6Deq2K/odRwWBizTnh0f86G3oSUQ8=; b=F3KTPJM28JoMV7NVwIgbHrfTUSO1KC1kNfgreTEbygTwBFheJNrMlma/IMoSIUNEeS EGTRNDW6O5p7c9kcPq4if9oyMvP5AnqjNyYzdg2vsM70/FWt2dwimG40eINVLqfC05Os sBiw27tOa5px1ajpbd0//NGI9OJmTdBYv1cMdgXxYhHbMkjYZ4MIIauKEccTK5TNa/aY 0y6l8WGHlIbjbm3uB9kbh5uqaLMCNFH2Q0GXEfGno//nlK+AQpGuZ4aDXWCTO1fl3RSj zsg8+5111PsvtDqF+PubvAiDeJoTXDQj23hboRYcMJ7Y1TNu0IhLVrIO3uc70YYUpfQe 4log== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708403560; x=1709008360; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=XDcsFixeKuMDXl6Deq2K/odRwWBizTnh0f86G3oSUQ8=; b=ThBHh4eEG+0xxvYBEThvtQdL8ELIRi90bOZr+PIRO2SAV4R3sr0fmVDQnkEKMgaKRY P7uNaELnDgLG2IQ+cyHCtxH5WIGiva1mWZCQ4/eatgnv12LynJHggT49bQWx6+PyxsWa w9LobflmwfsGTPy5IkRsPnTw91SMw1O3u48pxL/bFxM3R820vMS7wgd/7gyHn6BAvIYq tYD6PRGRGoRNW92kl20CoXFVq+7SrNNNwPCp7Ynit8s8Gmglkc7APKN1jnSdH693PPF4 lgXBOC4pE6ZPHoiSVlukm7ZfXWdcyPmzqhS2R+o2M/pl0lQW7wOe3eehCtCWCuXzsQiZ Tapg== X-Gm-Message-State: AOJu0Yzx6GszAdXnlBe+VpG2delj4308lSIzoPskP5DVqtewO0atMXeY 86Mj+kqVN7jK+YNKJ31CZZC6GuMONcELiQXFYedT3F59AaLeuAImMGn4p8PQ X-Google-Smtp-Source: AGHT+IEbxBE+mp8jpKbUJrRsrywDDd7XfJ1iR84KKSR5DH68ykGmaOMUEweBLVKE6AI7HU48VvhWAA== X-Received: by 2002:a05:6808:1a08:b0:3c1:5d20:8a65 with SMTP id bk8-20020a0568081a0800b003c15d208a65mr1939538oib.13.1708403560014; Mon, 19 Feb 2024 20:32:40 -0800 (PST) Received: from acleverhostname.attlocal.net (108-200-163-197.lightspeed.bcvloh.sbcglobal.net. [108.200.163.197]) by smtp.gmail.com with ESMTPSA id fu6-20020a0568705d8600b0021ed50d4741sm854858oab.7.2024.02.19.20.32.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Feb 2024 20:32:38 -0800 (PST) From: Eli Schwartz To: gentoo-dev@lists.gentoo.org Subject: [gentoo-dev] [PATCH 2/3] distutils-r1.eclass: wire up meson-python to meson.eclass Date: Mon, 19 Feb 2024 23:26:48 -0500 Message-ID: <20240220043235.3889132-3-eschwartz93@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240220043235.3889132-1-eschwartz93@gmail.com> References: <20240220043235.3889132-1-eschwartz93@gmail.com> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Archives-Salt: d133f76e-096b-4e9a-8c2c-51e6a2f3e6b7 X-Archives-Hash: d263765f04596d033798f22e712f7918 The meson-python build backend -- as the name suggests -- uses meson under the hood. We have a meson eclass which does lots of useful things pertinent to meson. Make sure it gets invoked. Signed-off-by: Eli Schwartz --- eclass/distutils-r1.eclass | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass index c0d1992ccce0..35825d4c3aa6 100644 --- a/eclass/distutils-r1.eclass +++ b/eclass/distutils-r1.eclass @@ -197,6 +197,10 @@ _DISTUTILS_R1_ECLASS=1 inherit flag-o-matic inherit multibuild multilib multiprocessing ninja-utils toolchain-funcs +if [[ ${DISTUTILS_USE_PEP517} = meson-python ]]; then + inherit meson +fi + if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then inherit python-r1 else @@ -1386,6 +1390,7 @@ distutils_pep517_install() { ) ;; meson-python) + meson_src_configure "${DISTUTILS_ARGS[@]}" local -x NINJAOPTS=$(get_NINJAOPTS) config_settings=$( "${EPYTHON}" - "${DISTUTILS_ARGS[@]}" <<-EOF || die @@ -1397,7 +1402,6 @@ distutils_pep517_install() { ninjaopts = shlex.split(os.environ["NINJAOPTS"]) print(json.dumps({ "builddir": "${BUILD_DIR}", - "setup-args": sys.argv[1:], "compile-args": ["-v"] + ninjaopts, })) EOF -- 2.43.0