From patchwork Mon Jun 2 23:38:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 893723 Delivered-To: patch@linaro.org Received: by 2002:adf:a2d4:0:b0:3a4:ee3f:8f15 with SMTP id t20csp44019wra; Mon, 2 Jun 2025 16:39:05 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXNdtY1c8R3SOxY9O7uqBo7VsOFKQy7eZYi0XVxZBGF4ZFjWUgWV9jJHfZFMtu5aGYNmmOtGQ==@linaro.org X-Google-Smtp-Source: AGHT+IEUrJK8BpSzZ5Q5oXj4zKe7EthaqwOFCpMD+4pz2AAV0StSEnldg9RhmLqdNdnVsG/W3qug X-Received: by 2002:a05:622a:40cb:b0:4a4:2be2:7567 with SMTP id d75a77b69052e-4a59adf8e1cmr10778951cf.8.1748907545374; Mon, 02 Jun 2025 16:39:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1748907545; cv=none; d=google.com; s=arc-20240605; b=J3zj8j6wb/taFWyFAGu+0xSr5CF8UykOh5A1qMVWX0hTXeu5wUPzhF6MBZdr5PE6ys pRNhfEAPT7pOCyNltlNBCmRuVBmwEm48552zzXF3KNXcdtZAUkVRl498tpn2djeNUa0n RMO0ulzUNEuL6nFQw62u3EYMgQDQ5o3a+pyvPvvmNp6tIugEWRlMfa7Krg91/Y9IuUvt H7rPZTQ88IPpyTVVPmWkMvRfrzvm4/gZRhDpd4NnLj5u3Ayl55g9BmChVb0GE8lXia0x 2+gMWf/nsB2no940PHBOskVofH/cAF2gtQV3xLgdgmfQOnsw04KHqu0qhseSqp85pRGB jcNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:message-id:date:subject:cc:to:from:dkim-signature; bh=MgSl8HuZl3uXlLASWUN9oqKEx0Hjz/JuuBfOVhQ8ywk=; fh=FMBhTP6sY4TP2F3CurtJ92J5tOgqA2m7QS4Kpn0c1a0=; b=DacKi8FTm9WhFRK/Rj8uzTVizfQImfwxkeKY6gHVInIwtxe4THWt+WVvYZiTJLfmpQ 89BGG/ueZVTDiRI7afhupLauuz21kLmEyqSvxFcFXzKb3LWu0AQBQBpR1y9Gge9mpndf 35JuTHzh5Qc6KsoUNyQusUobfxIVY4o8QSmhLgfEE36kLXi+XA7ctDHEuGqrU8gafuYL 8Sa9mJrMfdz2hmLDoB8WgbRU6R2VWK4Tv5pfKfafdfzjSrQB8GVkvebR5LuZ9EIXD90M YQQLgs8kNHe0hKtjD2SOVcSfASQKsdpZvkjBmmTy+ZhCWs8ZEvYTGqco/VyUpQSlpmRP empQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DRHu3Ddg; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-4a4359fc313si114727841cf.249.2025.06.02.16.39.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Jun 2025 16:39:05 -0700 (PDT) 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=pass header.i=@linaro.org header.s=google header.b=DRHu3Ddg; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uMEjP-0007q9-7R; Mon, 02 Jun 2025 19:38:15 -0400 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 1uMEjM-0007pw-K2 for qemu-devel@nongnu.org; Mon, 02 Jun 2025 19:38:12 -0400 Received: from mail-pl1-x62a.google.com ([2607:f8b0:4864:20::62a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uMEjK-0002eb-Id for qemu-devel@nongnu.org; Mon, 02 Jun 2025 19:38:12 -0400 Received: by mail-pl1-x62a.google.com with SMTP id d9443c01a7336-22e16234307so41207955ad.0 for ; Mon, 02 Jun 2025 16:38:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1748907488; x=1749512288; darn=nongnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=MgSl8HuZl3uXlLASWUN9oqKEx0Hjz/JuuBfOVhQ8ywk=; b=DRHu3DdgAXKNoFvNh9y5fSyhLlBTq30eUBlYo9r304HDRr/61MxnbM/Lm8U5CWmUUe c6NsZThshBP170zrwakxQSNo12vSC4fjcxyEkwH19kgKIbJAt5DdtFUg4x+KqWt9pUJv 7xtwoHQ41bVBc+msYNXnV0JrJXVPaNR5PW87dNagcPGjUonWaXHeG4/21p4t2cizmfNO oDHAJ+jb2CeWyQWAkvp2t0ysB+Ba0SucXjzqcb3VvXRSEAsbQ6NhRZNMHMS4AYQSln6T 2gASB0zF9X1cFjzNSuyVzvArYTPuko+ABiCJJCr/KX/MSbKkVwWEAqk3RsBNVr+EW2lV aJaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748907488; x=1749512288; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=MgSl8HuZl3uXlLASWUN9oqKEx0Hjz/JuuBfOVhQ8ywk=; b=YyIE/K0efzAJ89tWKpEqgeYsmr3qSgT9oiP2F2qKwV+kH0/jJblOjtCHuEGjjG/4uZ dQsH60fy209b3M6FzZguykuBvW9z17jiUSAOoLT3ZrAuRixIMkD/uhS5eSrDtP4aMz6B cfZKWDEnMsS8ZvwdgDzG9mQNf+pAw60eggoJxLEJHbwsAL3PzxlZO7RctW1Ayhf+Wc52 enrdiWcd0tcf8GCnHRNTt5ewhSmhOfUP37KBSmex8ZXMqyznZtNPFCtQ8jlcBwumV4/i Ir3rxWwgPgBrvq/q7Jx+n4F3kDBC/YfwP6MzghfaDoGh5UU8HkGXhw+yK0hy1+49msxW //AQ== X-Gm-Message-State: AOJu0YzWgQBSGorLWazJEkkIped/RQPYFiYg9ixhWbOThwpZSyFZZ/DI 6a1oq1SGJtmwNxyRXwhHcOna1Oxz8hzX1i84imKX2lPcEqXaDvc0m+sKMVs4FgI5AHFC5Xt0k/N bzp81 X-Gm-Gg: ASbGnctiK2j7tMcNdNYZXeWOwDH6kYuCrD1x7dcSzRDeEkRMNqRJiisKkGsyj4v3IAJ p60wMeoK3TFJQdR2EyXday/s1BJ9i5Nkb7WhOcsaASYl+bkZ5CT9AmGUVBn1ktBwHqPBAlU46QK ngAOx1//HwyIcWQYdlpn+Do+Zs0WMVMuB0y2jV7TokXT9X1EbYI1rYAsIMm9phVl5WchKxTCDK5 P+KjrrTPUBl0V0POeMOOsmZ+fr47murSmpWbOwjcsgS6R3GLqAFKYWloF581Mju4yrcbdH2IpD/ Exj5zmpBDKs6k5ZHlgUT8ng/Iyld24q0Tv7qpQLcC4TlDueH5MM= X-Received: by 2002:a17:903:19cc:b0:215:b1e3:c051 with SMTP id d9443c01a7336-235c9d95d68mr5008575ad.11.1748907488468; Mon, 02 Jun 2025 16:38:08 -0700 (PDT) Received: from pc.. ([38.41.223.211]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-23506cd362fsm76178925ad.116.2025.06.02.16.38.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Jun 2025 16:38:08 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: clg@redhat.com, nabihestefan@google.com, Paolo Bonzini , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , thuth@redhat.com, =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Pierrick Bouvier Subject: [PATCH] meson: use config_base_arch for target libraries Date: Mon, 2 Jun 2025 16:38:01 -0700 Message-ID: <20250602233801.2699961-1-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.2 MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62a; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x62a.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Fixed commit introduced common dependencies for target libraries. Alas, it wrongly reused the 'target' variable, which was previously set from another loop. Thus, some dependencies were missing depending on order of target list, as found here [1]. The fix is to use the correct config_base_arch instead. Kudos to Thomas Huth who had this right, before I reimplement it, and introduce this bug. [1] https://lore.kernel.org/qemu-devel/c54469ce-0385-4aea-b345-47711e9e61de@linaro.org/ Fixes: 4fb54de823e9 (meson: build target libraries with common dependencies) Signed-off-by: Pierrick Bouvier Reviewed-by: Thomas Huth Tested-by: Cédric Le Goater --- meson.build | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index 2df89006f8b..ad9cef99ed9 100644 --- a/meson.build +++ b/meson.build @@ -4142,13 +4142,12 @@ common_all = static_library('common', target_common_arch_libs = {} target_common_system_arch_libs = {} foreach target_base_arch, config_base_arch : config_base_arch_mak - config_target = config_target_mak[target] target_inc = [include_directories('target' / target_base_arch)] inc = [common_user_inc + target_inc] - target_common = common_ss.apply(config_target, strict: false) - target_system = system_ss.apply(config_target, strict: false) - target_user = user_ss.apply(config_target, strict: false) + target_common = common_ss.apply(config_base_arch, strict: false) + target_system = system_ss.apply(config_base_arch, strict: false) + target_user = user_ss.apply(config_base_arch, strict: false) common_deps = [] system_deps = [] user_deps = []