From patchwork Fri Apr 25 15:28:24 2025 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: 884408 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp4030062wrs; Fri, 25 Apr 2025 08:40:27 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUA8WrC5TGXTrcnuc3nsa7cjJbuQNREyEO205cxvj+SjJOt2bE5DpF609amZXhvjniFfwZVAA==@linaro.org X-Google-Smtp-Source: AGHT+IF87OgA/4DVZafYyhp0l42VCtzi4dQMBoZV9oVc7CyxBYxkCWOUZ6RsIC79KTQUpeLPJrWh X-Received: by 2002:a05:6102:3c8c:b0:4c2:fa6a:7e2d with SMTP id ada2fe7eead31-4d5432e840amr1881510137.1.1745595627286; Fri, 25 Apr 2025 08:40:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745595627; cv=none; d=google.com; s=arc-20240605; b=At+fcuvr1kObN6SFiiUprXJr4+mw1hoBl34MBu6LF8flsDA/POyo4Yyw1dgWTkcEDA 2cGb9Oj6g9N+iZwOVXGFgokhnvDJSoTZH16iWpKslRSbMc7Dgdgn5fac7w5SQHKnbKTY g6f0eGonhfxcH+xgIe0VJLGtVFUiOohGrOspbPJXjur/MXeVBmVvYiBTBdh+C17g5kJr 5TA5XzB9wGHUqtUopwYi1OpaW/mm06eplkhoEUTGylqDCHSaSYda/tDB+KYytKnnsfZg k8iHCr6R6qWYtXtsbybsHK5g+JZpq2DarS6xN0CMukp9kXG9vY6lUfi/lbcHJ1E/91sq pxUA== 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:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=bbFk5T/Gx2RWDfL/8OYFT9numZ3eK39ufVSLHy/LkBY=; fh=GZJSE/aUbRdovNATdnU5k0t9BY+wSWH68mcL6u6grC0=; b=ldVL7Yx1EtQycAZ9W9NvxVS+3ZGSYpqnRJJJE3VK6BVMdf/CxWPC+Ja8R41AMOyq6s r1kFjHcSmrJdLSjpoAKuZ5k6brh47+s6tD/Nw3kMxDhGIpSKAcaY8P3Vau6ttTF3rJTz zkR1HR0Si3feRgrWQJxY+nBC3tYv21nM4fpuFKy8BvcOsEBz+enouG4ycZ8IdSobN8o7 6Ntjb74YxKrGpXhD/zoPaJCoa3EYfHMXlTlpGpNF00cm7HHTMldyupf/9nn9mQhGI0DZ 5WvX8WeFavQXg+K8ZOeBKnQ4OcQn9ndtkEu0eDW3EreAAIL76RIyyS56BjtkrgYh1AjW JzwQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=bCaVA4Zi; 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 ada2fe7eead31-4d3d72d18cbsi1010757137.410.2025.04.25.08.40.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 25 Apr 2025 08:40:27 -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=bCaVA4Zi; 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 1u8L2R-0008J6-5z; Fri, 25 Apr 2025 11:32:27 -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 1u8L28-00072l-Ut for qemu-devel@nongnu.org; Fri, 25 Apr 2025 11:32:09 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u8L25-00047e-Ss for qemu-devel@nongnu.org; Fri, 25 Apr 2025 11:32:08 -0400 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-43edecbfb46so16114045e9.0 for ; Fri, 25 Apr 2025 08:32:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745595123; x=1746199923; 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=bbFk5T/Gx2RWDfL/8OYFT9numZ3eK39ufVSLHy/LkBY=; b=bCaVA4ZiSXabzNzP8I/NsEVXtdtCxEGhwS1KvVFyzQgIoIErNO5FO/r7xA99yGSjLv /dYhxCf69OqR5DqHCRCdeN7vWrV26yZ1q51HiNywVXk1vHM3UCCEKip6fKJGw8HlTP/x NVt3BpIHL9xwNnqvTEZ9dM24XPZbuyOReart+//aiXYFL1qkXHOmOQ/wWPqB1g4a6jvP 3b4oupQUwiUP6Ob6c2DbJEIgs1zzbIoCJuOFQF5cSHIW2kLZBHCrKn3fSdq1yav+goiF moNs9XmBBBLZFQI9+6p7PrKHiJ1oVmXs2ti3MIdMRtfgjQ8HYaAZQXwPoHa4yVjKk2nS DIZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745595123; x=1746199923; 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=bbFk5T/Gx2RWDfL/8OYFT9numZ3eK39ufVSLHy/LkBY=; b=ZhPQWGoKgrDVt8PoFGHUa8Y61K9dNJfgGe0gpAXTaVxQehTzkWnTEa6hDtvOg7Iqbv zAUzGHdNimJlBdS0h4HrffrwH86eep1Z9maGyrsevt+hp19wb8+SgeuZp9BPEp4XVucq OsJIO43PHDpCCPypaVGmf7XlPWOSmEeT7srjxSy3JyNfDmW734l1DMstS4KY7JEvwtfB 7bW5p1XD+B3b8ULhN0JSRV5vbN2M1BBf+B/z7OirjRAjzTJc3uEkNPkDcrHsh3UnH4tV 9cc0Wab3OWZ2DvQvicKTOsIABz0iWXg1Jf/CNEREXM3Kg7HEvKCzhoCL8MZPunhjVU23 pERQ== X-Gm-Message-State: AOJu0YwWB/ffoLqdW0t4nhPRJiPCyxPcoCbP8CYrli0kenr6KQ9l8tEF RhmySGaIZo9o62OyoPmv0sfFLEGWlyO5I1yGbn5tfSYeDiMXeeN8y3H6C8ER/gcjLyFGegdt4Nr 0 X-Gm-Gg: ASbGncu0vO2cqQOUVxnxdbtICITtQhFLnaHlrQAL1mL1UphgLilhUM9t2v1926vwlZn MtTED/fJY5cQdia4TTVyZdmK4f8WcM6u8AwaemL1kkG4AfE2RNtWemujKM9/YOx9nFnFEXkKSv4 Jem/DCjq5PFS/C2QdbvtM3I6tJ9mSOmshbAodAF76EThFdjQAnwCSRPR80DOLoI+0m/wfPYoyJy maRkwvRqUGFHeMuYHX3tNGP3/m/lNC00Il8CYrpunekCEfcixMlg5fFdpkEwmAOAgT3DAZVhw+w gvwWgQEMPFbLaPVgQZzMpgQd8iTB+bdw1SynSS8TN96UAuHyS/frFcT/yvf1L2AoSKQ7AV9XVYw WHCbRmjeAkB8POFM= X-Received: by 2002:a05:600c:a41:b0:43c:eeee:b706 with SMTP id 5b1f17b1804b1-440a6698266mr21912505e9.24.1745595123372; Fri, 25 Apr 2025 08:32:03 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-440a52f8794sm29256445e9.1.2025.04.25.08.32.02 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 25 Apr 2025 08:32:02 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Akihiko Odaki , qemu-stable@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 40/58] meson: Use osdep_prefix for strchrnul() Date: Fri, 25 Apr 2025 17:28:24 +0200 Message-ID: <20250425152843.69638-41-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250425152843.69638-1-philmd@linaro.org> References: <20250425152843.69638-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=philmd@linaro.org; helo=mail-wm1-x336.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=unavailable 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 From: Akihiko Odaki macOS SDK may have the symbol of strchrnul(), but it is actually available only on macOS 15.4 or later and that fact is codified in string.h. Include the header file using osdep_prefix to check if the function is available on the deployment target. Cc: qemu-stable@nongnu.org Signed-off-by: Akihiko Odaki Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Message-ID: <20250424-buildsys-v1-4-97655e3b25d7@daynix.com> Signed-off-by: Philippe Mathieu-Daudé --- meson.build | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index d93dbde194f..c736a6f4c4b 100644 --- a/meson.build +++ b/meson.build @@ -2193,6 +2193,7 @@ osdep_prefix = ''' #include #include + #include #include /* Put unistd.h before time.h as that triggers localtime_r/gmtime_r * function availability on recentish Mingw-w64 platforms. */ @@ -2657,7 +2658,7 @@ config_host_data.set('HAVE_GETIFADDRS', cc.has_function('getifaddrs')) config_host_data.set('HAVE_GLIB_WITH_SLICE_ALLOCATOR', glib_has_gslice) config_host_data.set('HAVE_GLIB_WITH_ALIGNED_ALLOC', glib_has_aligned_alloc) config_host_data.set('HAVE_OPENPTY', cc.has_function('openpty', dependencies: util)) -config_host_data.set('HAVE_STRCHRNUL', cc.has_function('strchrnul')) +config_host_data.set('HAVE_STRCHRNUL', cc.has_function('strchrnul', prefix: osdep_prefix)) config_host_data.set('HAVE_SYSTEM_FUNCTION', cc.has_function('system', prefix: '#include ')) if rbd.found() config_host_data.set('HAVE_RBD_NAMESPACE_EXISTS',