From nobody Sun Feb 8 21:33:37 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 163373507067279.46345373234885; Fri, 8 Oct 2021 16:17:50 -0700 (PDT) Received: from localhost ([::1]:45430 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mYz7d-0002my-4A for importer@patchew.org; Fri, 08 Oct 2021 19:17:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33826) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mYz5J-0008PA-Ga for qemu-devel@nongnu.org; Fri, 08 Oct 2021 19:15:25 -0400 Received: from mail-io1-xd2e.google.com ([2607:f8b0:4864:20::d2e]:40710) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mYz5G-0006S4-C8 for qemu-devel@nongnu.org; Fri, 08 Oct 2021 19:15:25 -0400 Received: by mail-io1-xd2e.google.com with SMTP id x1so8478394iof.7 for ; Fri, 08 Oct 2021 16:15:21 -0700 (PDT) Received: from dune.bsdimp.com (50-253-99-174-static.hfc.comcastbusiness.net. [50.253.99.174]) by smtp.gmail.com with ESMTPSA id b15sm293628ion.8.2021.10.08.16.15.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Oct 2021 16:15:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SaGqHKjeNHsGyyOiYm73uNe53IqF6hF9aBdLsXSA2EM=; b=CLffQe/3N6pOGX64njuzsGh+8OpfwOblPL0aP9Kf8CDg9cUTtY4pCfQOANoWpuiSen W3BorKiuCF2D+eYBeFJxAutz99ppuf9EoBe6C9CIY6xEh9tU92ZPIdaFKD2fiqAfEDvP /JzH7u1yVNLhr2M6b0ac2rz2SaJnkTzUep9rVD/w1aK54ib4CA0mEeRkwasBTFyS0QNt M0W+98bNXXpJusvWFF7sE9zYVUc/rIe/12tK2ksDCh+fUfMQx0+2VmRmkoDpLbqMWJQo +uZr1FtT/jB1rird4MbSBdyfzbZMq82NyBKHCttcDTU04ZluQJLSZAg4B2zY/X83lgCd Vz4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SaGqHKjeNHsGyyOiYm73uNe53IqF6hF9aBdLsXSA2EM=; b=rWZOSVZczgLnIybFfaGs67qobGHwpCYmoEulXcIhGUbsaLytlWap64uZigj8XUzKdQ xiNhGiCz/YJz6qdTstf8tJSO+r4u8zcHN51l/QdMadf+m+tc4IL5an8I0Nzv4pNyhlgA UXla+NX2bOPioJoTIwcTfivyihxV3bep2kuXzWcy848+S0R48+tCRfPohXTXmc15emM8 yHtZo7g/f/QVdoRBBdfZcmKh+sPXBglDuzsUMYQpvmQTfSBcApRJfxOaTlyNqngknkh0 +aTKaBhks1bi4kJegK2DsjrYgZV+M/TfTDpXVccJIzPRkYEWSLFz/MXtZqbe12i8ceok /ndg== X-Gm-Message-State: AOAM532ByjwAWFI0TI5Kv3v7BCIjUzquVK2WxwKE2yz2bFj+RKVBD6rD bnETfeMgSk2Njgis6kSdreIIwLi5X4xAlQ== X-Google-Smtp-Source: ABdhPJzshHPYHlClT+6cC+w8YXRRpdKAdR+f4bt9HN6uDVcth+uK2/JZkozWOCVYsOAA4QyURsgZbw== X-Received: by 2002:a02:9a14:: with SMTP id b20mr951498jal.83.1633734920893; Fri, 08 Oct 2021 16:15:20 -0700 (PDT) From: Warner Losh To: qemu-devel@nongnu.org Subject: [PATCH v2 01/15] meson: *-user: only descend into *-user when configured Date: Fri, 8 Oct 2021 17:14:52 -0600 Message-Id: <20211008231506.17471-2-imp@bsdimp.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211008231506.17471-1-imp@bsdimp.com> References: <20211008231506.17471-1-imp@bsdimp.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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: none client-ip=2607:f8b0:4864:20::d2e; envelope-from=imp@bsdimp.com; helo=mail-io1-xd2e.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=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: Kyle Evans , richard.henderson@linaro.org, Laurent Vivier , f4bug@amsat.org, Paolo Bonzini , Warner Losh , Warner Losh Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1633735072679100001 To increase flexibility, only descend into *-user when that is configured. This allows *-user to selectively include directories based on the host OS which may not exist on all hosts. Adopt Paolo's suggestion of checking the configuration in the directories that know about the configuration. Message-Id: <20210926220103.1721355-2-f4bug@amsat.org> Message-Id: <20210926220103.1721355-3-f4bug@amsat.org> Signed-off-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Warner Losh Acked-by: Paolo Bonzini Sponsored by: Netflix Reviewed-by: Kyle Evans --- bsd-user/meson.build | 4 ++++ linux-user/meson.build | 4 ++++ meson.build | 3 +-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/bsd-user/meson.build b/bsd-user/meson.build index 0369549340..243fb78930 100644 --- a/bsd-user/meson.build +++ b/bsd-user/meson.build @@ -1,3 +1,7 @@ +if not config_target.has_key('CONFIG_BSD_USER') + subdir_done() +endif + bsd_user_ss.add(files( 'bsdload.c', 'elfload.c', diff --git a/linux-user/meson.build b/linux-user/meson.build index 9549f81682..602255a3d6 100644 --- a/linux-user/meson.build +++ b/linux-user/meson.build @@ -1,3 +1,7 @@ +if not config_target.has_key('CONFIG_LINUX_USER') + subdir_done() +endif + linux_user_ss.add(files( 'elfload.c', 'exit.c', diff --git a/meson.build b/meson.build index 99a0a3e689..1f2da5f7d9 100644 --- a/meson.build +++ b/meson.build @@ -2303,10 +2303,9 @@ subdir('ebpf') =20 common_ss.add(libbpf) =20 -bsd_user_ss.add(files('gdbstub.c')) specific_ss.add_all(when: 'CONFIG_BSD_USER', if_true: bsd_user_ss) =20 -linux_user_ss.add(files('gdbstub.c', 'thunk.c')) +linux_user_ss.add(files('thunk.c')) specific_ss.add_all(when: 'CONFIG_LINUX_USER', if_true: linux_user_ss) =20 # needed for fuzzing binaries --=20 2.32.0