From patchwork Thu Aug 21 10:58:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Jansa X-Patchwork-Id: 68935 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 95718CA0FE0 for ; Thu, 21 Aug 2025 11:14:01 +0000 (UTC) Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by mx.groups.io with SMTP id smtpd.web10.6829.1755774833620892156 for ; Thu, 21 Aug 2025 04:13:53 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=SvPZA84z; spf=pass (domain: gmail.com, ip: 209.85.221.53, mailfrom: martin.jansa@gmail.com) Received: by mail-wr1-f53.google.com with SMTP id ffacd0b85a97d-3c46686d1e6so515988f8f.3 for ; Thu, 21 Aug 2025 04:13:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1755774832; x=1756379632; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=n719LzZgq6BMejCpU/qxVZmRf7DIHn6BPSts3Xdb9Jc=; b=SvPZA84z3B4inJbqj3qZUXVLBaZS7EibEMLguAZuRxO4FkFCA5inVWMYAteSR+RGRi Zo6bAMJOGdt5JVqEmn65nZ9bnt9HdCV8qsG481hQxcqy/eoZTLtYMNVxX6j0micVUlAj in7YvQfIcJgBq/oNKUyNnyFcypGUwHAm2zps7fr6fNMHQWuhVZokkh5b/lFKrPI3euZw C4KIM/u1j5vXf5Dbt7ep/23pn+W7gFmiyucvxmYtIrRW/nSlz62vHilg664+r3p6g11s rE0f/covRcL7aLyNfa5wtI4ujhU0ftkLG/xL71+c/RZJA5W3yBEqbmVfvhL50ptBuM0t 6beg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755774832; x=1756379632; 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=n719LzZgq6BMejCpU/qxVZmRf7DIHn6BPSts3Xdb9Jc=; b=KjD4WxkDujAxqzhv/RAePqFvhYOc1ysMCDlaQ0aDPn6XeD2tMCN0SA8jcaaVzakNHJ UAaD01IVh+rp6hHiIK72DiQPpeO+5fDJwD9MH/Xg2oS/R/l4yDYRxQ76uvGBKrLc/O9Y 0t35FfOyy0unmtAQ7xswE9rBOWfZWWNDiVOCl65DzLNH6yK9fJG6P/M0NPOogSVEgnU0 ggXqINhdy7y8FEeqmkYVmXYkwdzdBQHD6w0Y/byVC7BJC7cw4Td5EtdrU7pFB7FV9vsN rYVqDbDc90CxOC1ejmkRVIZ+o6kwvpoeJMBIX0Yq3f7x5HWkXuveilVpe7Tp5tbk+gID g4EA== X-Gm-Message-State: AOJu0YyU0t/SSIM9UbO6J6g2KWKhQU83FNgXs6jzDSqWZHF78z5UYliD J7vUwPBmx+NQinLbDuttK10kkkQ2qzjzD7CONJ1659iW4pttSOHgBSgLkYx5VA== X-Gm-Gg: ASbGnctDLSbPMWH8G3rsDAfg54XgbjvfEMxACvWfs8Z9IZEfOvtZgVZSRlxJkLLf6Jc RLMsDol3YwZcVN853f0kmng/FeSL06un8mmXF0fXDduzPkUi5xyCd82x3j4a07zX226oxH7V98D v1d+9cYUaxhPR3Rj135h4TYXHFjB6rxr/HIurCmGr497t448hmA2oyf9WGkzvNzR/0Idwe8pqgM FoDebtsvn+zcMziihhQty2rXJRzDaXqRp9mZfsMqYpGJ7KQRpiqU1IiXSDn4ille4K0fdyr+ivO hfxi3dkIYmGKKBmBNkrN9hpyTEdj8mtKZGiVWc7C2digXIRuGjqQuM+jF428IrcaD+xZq00y5zY xoI8w9Vq4GgT6sY/VJ2q5kwCEdys4jTo/8Cm5HZoDS7PCMZ0nmjrR8v8A X-Google-Smtp-Source: AGHT+IE2v5MHADTLQnOHUIabfuVqyVkZeXJdGUZUFZOcj01chdAUHNl/UW+bs0vi79JhMP6GJF1APQ== X-Received: by 2002:a05:6000:40cc:b0:3b8:d082:42a with SMTP id ffacd0b85a97d-3c49727452bmr1507426f8f.45.1755774831819; Thu, 21 Aug 2025 04:13:51 -0700 (PDT) Received: from localhost (ip-109-238-218-228.aim-net.cz. [109.238.218.228]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-3c074e38d7dsm11146952f8f.26.2025.08.21.04.13.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Aug 2025 04:13:50 -0700 (PDT) From: martin.jansa@gmail.com To: openembedded-core@lists.openembedded.org Cc: steve@sakoman.com, Khem Raj , Richard Purdie , Martin Jansa Subject: [scarthgap][PATCH 1/3] ncurses: Pin to C17 standard Date: Thu, 21 Aug 2025 12:58:38 +0200 Message-ID: <20250821105840.3045170-1-martin.jansa@gmail.com> X-Mailer: git-send-email 2.51.0 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 21 Aug 2025 11:14:01 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/222227 From: Khem Raj Newer snapshots of ncurses have the fixes but they are many needed to get C23 going. Until next release lets stick with C17 even while GCC 15 switches to C23 defaults. For scarthgap also add it in BUILD_CFLAGS. Signed-off-by: Khem Raj Signed-off-by: Richard Purdie Signed-off-by: Martin Jansa --- meta/recipes-core/ncurses/ncurses.inc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc index 3b72f3efdd..5ef735fcf8 100644 --- a/meta/recipes-core/ncurses/ncurses.inc +++ b/meta/recipes-core/ncurses/ncurses.inc @@ -30,6 +30,10 @@ ENABLE_WIDEC ?= "true" # _GNU_SOURCE is required for widec stuff and is not detected automatically CPPFLAGS += "-D_GNU_SOURCE" +# Check if we still need it when next release (6.6) happens +CFLAGS += "-std=gnu17" +BUILD_CFLAGS += "-std=gnu17" + # natives don't generally look in base_libdir base_libdir:class-native = "${libdir}" From patchwork Thu Aug 21 10:58:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Jansa X-Patchwork-Id: 68933 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 92D9BCA0EDC for ; Thu, 21 Aug 2025 11:14:01 +0000 (UTC) Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by mx.groups.io with SMTP id smtpd.web10.6830.1755774836977282803 for ; Thu, 21 Aug 2025 04:13:57 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=mqvZJS9H; spf=pass (domain: gmail.com, ip: 209.85.128.48, mailfrom: martin.jansa@gmail.com) Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-45a1b004a31so6067795e9.0 for ; Thu, 21 Aug 2025 04:13:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1755774835; x=1756379635; darn=lists.openembedded.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=J6nojg24/s0JVw9dqbz7k8shPVGuUVwSLAdlGFHMwY8=; b=mqvZJS9HzFCrhuNGi/wmS08pgt2iiNjtjcur75220uRA8cIWO9lWvU1BF6GtMvBUf9 IMQ8joKQm1ZBlbgFcdrAPtIBWNZCo2ykQKoKqMhJ/wVGdk60iyV91QPLJLhKAKskeFMH X4dlg4fCYTpqn2XjK4L8h5g+juaoPbgF71M81fGffkxCZG6TRMtnUpxNpGTUjlZijmoX 2RWfyOJpHxnkknjTPUOOzD+SyDzNugdk6gdenC5VCFCBjASRWMaJpXQJpxv/906N/jwq 6AUWoMp1bcI3nTSIO7qr1YKSilWOdqwR1ppJpU0IoqMLhwokTnkPueNFza8SVoHlKrnY Kxvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755774835; x=1756379635; 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=J6nojg24/s0JVw9dqbz7k8shPVGuUVwSLAdlGFHMwY8=; b=g6tyWiYRXbHdxjZgzE/Q+90wmYhOqG6vbHxgFguipetDLurfUBkevoxoRaQesDTH+d gQvoPGpMOmGdeXqRK67Kb5dm5r7pavs1lORKDt8PPrg/dFHhzHw6OHaO/2/HHxtd3vm4 sPwsVUiJ34xC4YX6SOMJCmzPWREaXBfuB4FHNlSVx7A8zDVuY1//SvMMvhlfJuoXKGq6 v0ANYhrmP7Qs6vM038wJRQCCfmv+fneaRwlLo14vjDEWt3KpnBL/KrV4oQ/7IXt+QA+E xkp/fXjyOZyTcL64V0gVLzvN6QOf2fXJqfaRz3ON2GIvgBUe1cezjBGkGGzktyVxTdmK PVgA== X-Gm-Message-State: AOJu0YxvPGyggYyyRubPosBCU4b9ax12nmT6vM+EahxnEqklVVpwG0WD qKYeTGIq+S9RlpIL5PGJCQXodLgd/IO1dtLbqnopRW53SnXxaZvMsswO4I6kKQ== X-Gm-Gg: ASbGncvWZ+GIKtAtkS1JGlyZoprfdNPB0engUP7lxW5wbdi7Lx3iIFr02Luah/rS8Qu fLMBdhBnTDWbryz+8p165wo+VXEvc5gzTw4RyRXD2QJxCk3liWjQqDaB6ONkVBmDTqFVfRj7QHX H+0s59JLNOLyWv1tKXmuBrA2IXft1FxMmp3KRr81UjBQPJMgKFPTaKPBoBmKb20i9wOPZEW/GC8 x1vY1swhBM6wMIhLH5ZYRtlMHq/5jdGzuyREtatmAYHf3NynTk360p6OgOoqd4/4MqRvv7J/GSa kpuENQU1a6fEl5jmpoSZfqv5MuaCpRVMaZENtEtysW8LteHcTAGAQdv65piBKck1IfSyt+rKifZ ttX3z5Xz1r+VhP0S/52B2OlZdHB6+hn6v8knC2A5AM7FiyN3QFtRj7nL8 X-Google-Smtp-Source: AGHT+IHyb2EX7D6HwEoODermD4f+yeNUxItUsJlkw7q7M0wc8useQxn6bvt8O63CX9Synn1PtIZpMw== X-Received: by 2002:a05:6000:310c:b0:3b8:d69b:93b with SMTP id ffacd0b85a97d-3c4973690d8mr1788541f8f.52.1755774835245; Thu, 21 Aug 2025 04:13:55 -0700 (PDT) Received: from localhost (ip-109-238-218-228.aim-net.cz. [109.238.218.228]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-3c077789106sm11235997f8f.51.2025.08.21.04.13.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Aug 2025 04:13:54 -0700 (PDT) From: martin.jansa@gmail.com To: openembedded-core@lists.openembedded.org Cc: steve@sakoman.com, Martin Jansa Subject: [scarthgap][PATCH 2/3] cmake: fix build with gcc-15 on host Date: Thu, 21 Aug 2025 12:58:39 +0200 Message-ID: <20250821105840.3045170-2-martin.jansa@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250821105840.3045170-1-martin.jansa@gmail.com> References: <20250821105840.3045170-1-martin.jansa@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 21 Aug 2025 11:14:01 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/222228 From: Martin Jansa Signed-off-by: Martin Jansa --- meta/recipes-devtools/cmake/cmake.inc | 1 + .../0001-cppdap-fix-build-with-gcc-15.patch | 30 +++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 meta/recipes-devtools/cmake/cmake/0001-cppdap-fix-build-with-gcc-15.patch diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc index a52506a8ea..b8667832e2 100644 --- a/meta/recipes-devtools/cmake/cmake.inc +++ b/meta/recipes-devtools/cmake/cmake.inc @@ -18,6 +18,7 @@ CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}" SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \ file://0001-CMakeDetermineCompilerABI-Strip-pipe-from-compile-fl.patch \ + file://0001-cppdap-fix-build-with-gcc-15.patch \ " SRC_URI[sha256sum] = "72b7570e5c8593de6ac4ab433b73eab18c5fb328880460c86ce32608141ad5c1" diff --git a/meta/recipes-devtools/cmake/cmake/0001-cppdap-fix-build-with-gcc-15.patch b/meta/recipes-devtools/cmake/cmake/0001-cppdap-fix-build-with-gcc-15.patch new file mode 100644 index 0000000000..1ff0764018 --- /dev/null +++ b/meta/recipes-devtools/cmake/cmake/0001-cppdap-fix-build-with-gcc-15.patch @@ -0,0 +1,30 @@ +From f742c298a0d6b70059e5c98c89d301e62a3e2087 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Christoph=20Gr=C3=BCninger?= +Date: Thu, 8 Aug 2024 20:26:35 +0200 +Subject: [PATCH] cppdap: include/dap/network.h: add include for GCC + 15 + +GCC 15 requires the include for the declaration of `uint32_t`. +Backport [cppdap PR 133](https://github.com/google/cppdap/pull/133). + +Upstream-Status: Backport [https://gitlab.kitware.com/cmake/cmake/-/commit/f742c298a0d6b70059e5c98c89d301e62a3e2087] +Signed-off-by: Martin Jansa +--- + Utilities/cmcppdap/include/dap/network.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Utilities/cmcppdap/include/dap/network.h b/Utilities/cmcppdap/include/dap/network.h +index 9d14f6b70fa..dd3e0062407 100644 +--- a/Utilities/cmcppdap/include/dap/network.h ++++ b/Utilities/cmcppdap/include/dap/network.h +@@ -17,6 +17,7 @@ + + #include + #include ++#include + + namespace dap { + class ReaderWriter; +-- +GitLab + From patchwork Thu Aug 21 10:58:40 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Jansa X-Patchwork-Id: 68934 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 93C66CA0EFF for ; Thu, 21 Aug 2025 11:14:01 +0000 (UTC) Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by mx.groups.io with SMTP id smtpd.web10.6831.1755774839599516677 for ; Thu, 21 Aug 2025 04:13:59 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=GGD0USLg; spf=pass (domain: gmail.com, ip: 209.85.128.42, mailfrom: martin.jansa@gmail.com) Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-45a1b098f43so6316075e9.2 for ; Thu, 21 Aug 2025 04:13:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1755774838; x=1756379638; darn=lists.openembedded.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=iENRiQNrM79qvkY7wAvzH6BuLlc1Uhs6XSMiRioDLAI=; b=GGD0USLgoN2x8QW0RJXB9SiZlrct1BxGIcmqYK1pbK9UgCFd3DvUlmtTsYqWSCEqdE yWBvwAw05KOOdjeWjfQclBQmJCToi1Wn8j5F4+8g75VeF/DH7UF1CPZ3e7mUhQJ5eOjG xGsiELnhH2ArC2D3uBAE9l29N1u0sXCKvAjE0oCvRf1v+iAIRwr3zADuPVuHeF2p2jMz ue5oTtLai8904aYwEWomySV9oKqpTCPm1FplMuUkXcuP6xsbtLwxk0Jif75EEjswFhId 6233K2upMY1YwNR+i014+TgmCXUIhVaBnmyEe/9s4bD/IVjxkwsRxv4D8I1Un4pxJu0y xsDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755774838; x=1756379638; 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=iENRiQNrM79qvkY7wAvzH6BuLlc1Uhs6XSMiRioDLAI=; b=CawvWgfEa9lyY5wrgAQBnWGgIfo+MbtjkcVKLyYz9rSWjfW2EzWIgSA/qPa3xpu+LI fL+1v238YRxUXTlKRrFom4WlxHw/sdd1PLSyCl3h6QMmUDcEW8X0k1S4V3OtzB1uFO6G weUFBK/yGZzAi0CBrDviQ22ZgW7rqV2SDn6OU27ZJfiqfYWpLmKZ/oNaIpnz5JYLcUSL rGHdnsXqOW5Um5tCtiGuAy2KkJwDIa7/SuyBy/2QqITjohyy1QSJ0F7vMroFIkmoym2t NPJlsdMzfEqiE/UYbaEfvkxQZ5av9IJhGLODtGzxdZtAeM6JIpYBWIT7+e6dwVgRd2Rq nq4w== X-Gm-Message-State: AOJu0Yw9PuThPafeJrG+yHfCTEhmm2uot7ucrpnj5KgKmL3OP4sU5v4j 5NSycazC2FJV7U6G2QeNSrSVAEy8JmAwAH6sEKCtCjmAX2bXx3QbnY3YIoeNjw== X-Gm-Gg: ASbGncvEsEqWiz0GG3wWBfkfyMAA+ikM52NxSO4kOEINygyUFUMtgEIQ9QAHTAOYPH6 rnJkdn2ncHaQmOnHYoAli0hRLiKXc99Gs7pZzkway7BfIsIV/NySSqps9WJtkZyTFyMECM/ww8N DDzq2z4uy+G5bSCPepc9djJ5rWuT2nmUMHqH5rT+XToUDQKSYsQ3OhLIMdxt/Pta1/Hqroi67Li /wSXsSbve1hpif93bmn0GH0ROyvmF4gyymq7FOwyu31O7skpLV3bUCKuqETH2MutjlmmpJKI7vJ U83IFTlH4kd7kbjEI4ez+mpGvoTXULfIhpZJlER4XN5eDp/Dtl5fNrKwwmvzE+9Jw1lFHbgEFTp OBuEGiVwlbgr12mto5nkFu2ye5xW10Fklg49FoqbsUh4nK1OsVKPnWp6M X-Google-Smtp-Source: AGHT+IH2CKonpVZGSUwARAsT584IxfWWgcMoyBZj06mNXVCShSVni6oP/Y3YGGPt7Lo3xjiJZOPHWQ== X-Received: by 2002:a05:600c:1d1c:b0:458:a992:6f1e with SMTP id 5b1f17b1804b1-45b4d7dc73amr22347755e9.5.1755774837825; Thu, 21 Aug 2025 04:13:57 -0700 (PDT) Received: from localhost (ip-109-238-218-228.aim-net.cz. [109.238.218.228]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-45b4db2aa09sm23953195e9.9.2025.08.21.04.13.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Aug 2025 04:13:57 -0700 (PDT) From: martin.jansa@gmail.com To: openembedded-core@lists.openembedded.org Cc: steve@sakoman.com, Martin Jansa Subject: [scarthgap][PATCH 3/3] git: fix build with gcc-15 on host Date: Thu, 21 Aug 2025 12:58:40 +0200 Message-ID: <20250821105840.3045170-3-martin.jansa@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250821105840.3045170-1-martin.jansa@gmail.com> References: <20250821105840.3045170-1-martin.jansa@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 21 Aug 2025 11:14:01 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/222229 From: Martin Jansa Signed-off-by: Martin Jansa --- ...ndex-pack-rename-struct-thread_local.patch | 67 +++++++++++++++++++ .../git/0001-reflog-rename-unreachable.patch | 40 +++++++++++ meta/recipes-devtools/git/git_2.44.4.bb | 2 + 3 files changed, 109 insertions(+) create mode 100644 meta/recipes-devtools/git/git/0001-index-pack-rename-struct-thread_local.patch create mode 100644 meta/recipes-devtools/git/git/0001-reflog-rename-unreachable.patch diff --git a/meta/recipes-devtools/git/git/0001-index-pack-rename-struct-thread_local.patch b/meta/recipes-devtools/git/git/0001-index-pack-rename-struct-thread_local.patch new file mode 100644 index 0000000000..b3b490064f --- /dev/null +++ b/meta/recipes-devtools/git/git/0001-index-pack-rename-struct-thread_local.patch @@ -0,0 +1,67 @@ +From e8b3bcf49120309b207b7afc25c4aa81b866ac45 Mon Sep 17 00:00:00 2001 +From: "brian m. carlson" +Date: Sun, 17 Nov 2024 01:31:48 +0000 +Subject: [PATCH] index-pack: rename struct thread_local + +"thread_local" is a keyword in C23. To make sure that our code compiles +on a wide variety of C versions, rename struct thread_local to "struct +thread_local_data" to avoid a conflict. + +Signed-off-by: brian m. carlson +Signed-off-by: Junio C Hamano + +Upstream-Status: Backport [v2.48.0 e8b3bcf49120309b207b7afc25c4aa81b866ac45] +Signed-off-by: Martin Jansa +--- + builtin/index-pack.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/builtin/index-pack.c b/builtin/index-pack.c +index e228c56ff2..74675dbd6c 100644 +--- a/builtin/index-pack.c ++++ b/builtin/index-pack.c +@@ -94,7 +94,7 @@ static LIST_HEAD(done_head); + static size_t base_cache_used; + static size_t base_cache_limit; + +-struct thread_local { ++struct thread_local_data { + pthread_t thread; + int pack_fd; + }; +@@ -117,7 +117,7 @@ static struct object_entry *objects; + static struct object_stat *obj_stat; + static struct ofs_delta_entry *ofs_deltas; + static struct ref_delta_entry *ref_deltas; +-static struct thread_local nothread_data; ++static struct thread_local_data nothread_data; + static int nr_objects; + static int nr_ofs_deltas; + static int nr_ref_deltas; +@@ -148,7 +148,7 @@ static uint32_t input_crc32; + static int input_fd, output_fd; + static const char *curr_pack; + +-static struct thread_local *thread_data; ++static struct thread_local_data *thread_data; + static int nr_dispatched; + static int threads_active; + +@@ -390,7 +390,7 @@ static NORETURN void bad_object(off_t offset, const char *format, ...) + (uintmax_t)offset, buf); + } + +-static inline struct thread_local *get_thread_data(void) ++static inline struct thread_local_data *get_thread_data(void) + { + if (HAVE_THREADS) { + if (threads_active) +@@ -401,7 +401,7 @@ static inline struct thread_local *get_thread_data(void) + return ¬hread_data; + } + +-static void set_thread_data(struct thread_local *data) ++static void set_thread_data(struct thread_local_data *data) + { + if (threads_active) + pthread_setspecific(key, data); diff --git a/meta/recipes-devtools/git/git/0001-reflog-rename-unreachable.patch b/meta/recipes-devtools/git/git/0001-reflog-rename-unreachable.patch new file mode 100644 index 0000000000..a44fe91dd3 --- /dev/null +++ b/meta/recipes-devtools/git/git/0001-reflog-rename-unreachable.patch @@ -0,0 +1,40 @@ +From 639cd8db63b07c958062bde4d3823dadbf469b0b Mon Sep 17 00:00:00 2001 +From: "brian m. carlson" +Date: Sun, 17 Nov 2024 01:31:49 +0000 +Subject: [PATCH] reflog: rename unreachable + +In C23, "unreachable" is a macro that invokes undefined behavior if it +is invoked. To make sure that our code compiles on a variety of C +versions, rename unreachable to "is_unreachable". + +Signed-off-by: brian m. carlson +Signed-off-by: Junio C Hamano + +Upstream-Status: Backport [v2.48.0 639cd8db63b07c958062bde4d3823dadbf469b0b] +Signed-off-by: Martin Jansa +--- + reflog.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/reflog.c b/reflog.c +index 875ac1aa66..aeab78c9b7 100644 +--- a/reflog.c ++++ b/reflog.c +@@ -210,7 +210,7 @@ static void mark_reachable(struct expire_reflog_policy_cb *cb) + cb->mark_list = leftover; + } + +-static int unreachable(struct expire_reflog_policy_cb *cb, struct commit *commit, struct object_id *oid) ++static int is_unreachable(struct expire_reflog_policy_cb *cb, struct commit *commit, struct object_id *oid) + { + /* + * We may or may not have the commit yet - if not, look it +@@ -265,7 +265,7 @@ int should_expire_reflog_ent(struct object_id *ooid, struct object_id *noid, + return 1; + case UE_NORMAL: + case UE_HEAD: +- if (unreachable(cb, old_commit, ooid) || unreachable(cb, new_commit, noid)) ++ if (is_unreachable(cb, old_commit, ooid) || is_unreachable(cb, new_commit, noid)) + return 1; + break; + } diff --git a/meta/recipes-devtools/git/git_2.44.4.bb b/meta/recipes-devtools/git/git_2.44.4.bb index 66936417e1..3c94667382 100644 --- a/meta/recipes-devtools/git/git_2.44.4.bb +++ b/meta/recipes-devtools/git/git_2.44.4.bb @@ -11,6 +11,8 @@ PROVIDES:append:class-native = " git-replacement-native" SRC_URI = "${KERNELORG_MIRROR}/software/scm/git/git-${PV}.tar.gz;name=tarball \ file://fixsort.patch \ file://0001-config.mak.uname-do-not-force-RHEL-7-specific-build-.patch \ + file://0001-reflog-rename-unreachable.patch \ + file://0001-index-pack-rename-struct-thread_local.patch \ " SRC_URI:append:class-nativesdk = " \