From patchwork Tue Nov 23 17:37:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 519335 Delivered-To: patch@linaro.org Received: by 2002:ac0:c605:0:0:0:0:0 with SMTP id p5csp8987252imj; Tue, 23 Nov 2021 09:48:42 -0800 (PST) X-Google-Smtp-Source: ABdhPJwhuz0g0DZ62VNmXWqLwZxNnhfYAejLJTxGm9RdiopbaiC+uAN780yCIqO/dQ8/xIu30COt X-Received: by 2002:a05:6102:e14:: with SMTP id o20mr11359586vst.26.1637689722217; Tue, 23 Nov 2021 09:48:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1637689722; cv=none; d=google.com; s=arc-20160816; b=Eu3db1dpkHQRbclntRqaw1fFrYDx5sQOAcmh9Rt1Q5gFGuy3Z0qfj0wdL2WA57G8vW LUO4YMjJsWWTRDkvCz+rbX5ECbWuZbYAUzqMH1jUw5i+seldUKumFKrN0ZhOLAB/zzQ2 nEqps7VIkeUiWIHyOOqZlDiEAxKd87R/xdyDxaPjYaD1nLzcAx1KZdqE0gi06Hx6UfSk VBqOecAGmVt6uUuXYORkys9BKsLOtCOXB0+WlPDNFPfJZy6NdBSBoq714A7XG331JGq/ UUZcJ/fuUmvCTmoWc0IfxOB2H7dYw6BV04Dgu6dW2d3cAtRJU/BsavY54EPEisOatAHl 3jMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=EG4DMUGXVEyZNv1Q4b/NktcGLb+o4TMJ3Kcuz4Efvk0=; b=Uu1YztwlNmrdvQP8qjoGpyVS8PPsvLoOMkLe2e4ujyvOde1cdavMwuTZb/4xx80upO g8XtV/3g2yMN8B7iBUi5be7JG5W3FSUT8aU6tzBkK7nvpKTldicTna8NJFsXgKw5HrSe Y1158BGrXReaegUornrr7aZb7I7o5eBdbxFAbxPzJ7Ll0Zn7dfXJLixOpjgJp7a59TJe E9oKmgqFgeWRSjx6q3pBnJSKHXB5XnWlRcHOasNGqzOy4VL2dqL1/n0Ie/oCmTn4jtVu XInafD2N81IU+/t/fov9QLMuPz9aBa8rhhZH0VnKoZbx8NB3QMg6Erk1YsuMYH0hdG7z s8ww== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=VmB3ArHR; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 4si14538925vkg.64.2021.11.23.09.48.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 Nov 2021 09:48:42 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=VmB3ArHR; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:34308 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mpZuL-0001Nf-Nb for patch@linaro.org; Tue, 23 Nov 2021 12:48:41 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52446) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mpZkT-0004pT-6T for qemu-devel@nongnu.org; Tue, 23 Nov 2021 12:38:29 -0500 Received: from [2a00:1450:4864:20::42a] (port=41487 helo=mail-wr1-x42a.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mpZkR-00052J-QT for qemu-devel@nongnu.org; Tue, 23 Nov 2021 12:38:28 -0500 Received: by mail-wr1-x42a.google.com with SMTP id a9so40276003wrr.8 for ; Tue, 23 Nov 2021 09:38:27 -0800 (PST) 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=EG4DMUGXVEyZNv1Q4b/NktcGLb+o4TMJ3Kcuz4Efvk0=; b=VmB3ArHRas2JsubwzWGCImBIQHihsJKdV4h4a6Tw7prAar7RzvHEkVr18HXMIToOgk pZggtwS+EJpbtuAU2Hz/SCE2hLAv/9hrLUa4G16pvycuihkPqRfUqNFI1ZvCVhCJDNrg PotuyUUgn1ADWiquV9aBuk0SDPlAB7J/4+CKqAvUpDNo550aSTMWuNoa3nMGaiSWnPTT lteG9r+CfmwuSQLHOtMGtIoD3MqcG3gJZiSg8a1qXnNzv1NdImuHl67a80Ztg986G4eP nDHiG4yTDNPRS/6BK3bXLcP+MQVnT1P2N8ychLXfeoojIsyViTNX7K+jIXjKsPVzo3hB 1f8A== 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=EG4DMUGXVEyZNv1Q4b/NktcGLb+o4TMJ3Kcuz4Efvk0=; b=HHThhQqyiFihKngKIJkuxtJMHK05VW5kZhOaICcLtSETlTgEWFHw5S1V6F0lMqVD6A IRhh01paRNPBwfkR7n48vGuOSqMoXf0aLEYGvyKCiwSC2kBdiDIpFwd1k/ysXW/SrcHi oYfHkBQRafUYY0eF8OEUREBMehtas6K6omKSEB2GU3GS7ozU9/S0rsLI0MApj3nPOVMj 1JkXWyzLRx8m5VonRNLBHhjbLSFmFS/p8/aHCB0f9Rx28UJxcbJ9REOMl9abuBBDLV47 nlNCmDq+EMWR+vCPwZYMZnJPxYNBOn8uDlLd9XMvHqh88z5pyG0K+k10W8QRDL0GfOoC WI1Q== X-Gm-Message-State: AOAM533oNl7AnrwPpNS/9nCX3CCqnZRIfjAz77j4mT2r/I3lSj6ZLUA0 mEHzoR0glP+3mM6o8NLTpR1oplrVS8NfOOtq35o= X-Received: by 2002:a5d:4a0b:: with SMTP id m11mr9324459wrq.120.1637689106475; Tue, 23 Nov 2021 09:38:26 -0800 (PST) Received: from cloudburst.home (149.164.14.37.dynamic.jazztel.es. [37.14.164.149]) by smtp.gmail.com with ESMTPSA id n13sm13054883wrt.44.2021.11.23.09.38.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Nov 2021 09:38:26 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v6 16/16] meson: Move bsd_user_ss to bsd-user/ Date: Tue, 23 Nov 2021 18:37:59 +0100 Message-Id: <20211123173759.1383510-17-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211123173759.1383510-1-richard.henderson@linaro.org> References: <20211123173759.1383510-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::42a (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=richard.henderson@linaro.org; helo=mail-wr1-x42a.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 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, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: , Cc: laurent@vivier.eu, imp@bsdimp.com, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We have no need to reference bsd_user_ss outside of bsd-user. Go ahead and merge it directly into specific_ss. Reviewed-by: Warner Losh Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- meson.build | 3 --- bsd-user/meson.build | 4 ++++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index bf7af382de..e425129011 100644 --- a/meson.build +++ b/meson.build @@ -2363,7 +2363,6 @@ genh += hxdep authz_ss = ss.source_set() blockdev_ss = ss.source_set() block_ss = ss.source_set() -bsd_user_ss = ss.source_set() chardev_ss = ss.source_set() common_ss = ss.source_set() common_user_ss = ss.source_set() @@ -2618,8 +2617,6 @@ subdir('common-user') subdir('bsd-user') subdir('linux-user') -specific_ss.add_all(when: 'CONFIG_BSD_USER', if_true: bsd_user_ss) - common_user_ss = common_user_ss.apply(config_all, strict: false) common_user = static_library('common-user', sources: common_user_ss.sources(), diff --git a/bsd-user/meson.build b/bsd-user/meson.build index 25c3976ead..9fcb80c3fa 100644 --- a/bsd-user/meson.build +++ b/bsd-user/meson.build @@ -2,6 +2,8 @@ if not have_bsd_user subdir_done() endif +bsd_user_ss = ss.source_set() + common_user_inc += include_directories('.') bsd_user_ss.add(files( @@ -17,3 +19,5 @@ bsd_user_ss.add(files( # Pull in the OS-specific build glue, if any subdir(targetos) + +specific_ss.add_all(when: 'CONFIG_BSD_USER', if_true: bsd_user_ss)