From patchwork Sun Aug 17 20:50:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Jansa X-Patchwork-Id: 68691 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 11944CA0EE4 for ; Sun, 17 Aug 2025 20:50:43 +0000 (UTC) Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by mx.groups.io with SMTP id smtpd.web11.60585.1755463839555623486 for ; Sun, 17 Aug 2025 13:50:39 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=dNJParXE; spf=pass (domain: gmail.com, ip: 209.85.128.45, mailfrom: martin.jansa@gmail.com) Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-45a1b05fe23so19881035e9.1 for ; Sun, 17 Aug 2025 13:50:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1755463838; x=1756068638; 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=haHlDiB2C4DbL+ctmFTKki/dSJZv/BKf+xzdjoAt+NM=; b=dNJParXE4zQoCopWBquK+/ok9HZuoySG418lmQO3vePDGo+gOfNJvTKUowe+DOir2Y EflMRzBoOlMsrYLtsRp6v+NhxX28KmIM9k+4OKvypOTzy3OqGYJ9awZelDZcArVZDB3C p5pBmVmF515IGytKXMvUlfuntCzj/h+G/2aPwVx00TT+QUq8+MWCkmDqg1yl3pZIIOgr rhwoVCR1/jPVUBiLvgYkSvnFzO5Qj7MGPJZRJ6WKprDygp2eRdRADEQJhtGjqrks5JFP jgD5Q97UPT795IMRc1YgXjiZuGUUtNiyuYNE2X0EIVo7k8QsU9F7F+Vaq3me3RqXE8m1 6rQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755463838; x=1756068638; 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=haHlDiB2C4DbL+ctmFTKki/dSJZv/BKf+xzdjoAt+NM=; b=gBTNaN/L+TtFCls3ZpqAbNjOuRamYRfk2BS312+QHtGriqI22Mta30N1OFE3ILNr/g t5KVmlPTa2NcJkxku7z53OviYCv7EVUKkkNr3qmndGxMn2Vfqz1CxrYiEqZmoBr8nIuj /RrxOrLrftCzCPWSoRK12vl0WGod7sPU1qttFsov9pM1ODpbhhumJmoWbBFRg9rNQNh3 FX/QtmRnlQuRE395PXjUROKhccs8+a8o3YPBzbNXhYpb+lX4SLORuVAlOz7hfJ94/8hr z401BfSjisSq72w9FcIR/EkcovgU5zIXh4/sTl0B1Zg0RJR+xcofyjnHpg/EBvV33T+S Pu2w== X-Gm-Message-State: AOJu0Yz4FFdh6OiEl59TkyzNWzzONX/GzRNjB/IXGkX10qGWdduVNJVd XGdwoo/68R3jXJRFwQtaGJLY/fXSl7TyW84d0h95rPIOZEx+5DKN60r+NEhw1g== X-Gm-Gg: ASbGncvtK0CPGVICmZCSyWUDZDGQhmYG57wfNkgj+rG5W/cwrtMhbGsuTxmZdCZaI9p yLLDYQPThGOCcx7tjcJ5eqlcsScea0aUSGFRq27Nu4/AjZFLxWKbAj59N25OxqrN0jYtqbK6vKE 5jYmWoIDrxh1fuyjhoMwwkl1FFzgcxAe2DBEr7C0fFe7boOC0rD4AgE950Yp6FoJBdGPcEMMtLI +ibr7pofZ313o0SsmDYyJFIqRs/JRPBobN/ePZcZyaQEhyDR4utQubI7rpmWvjruYguxmSsfOEs AwtGDrrnAJn78dQPEG+lsKrabZkBYZdr5SIlUQErlnrhoAMVrukdFSERGuiF668K0l4THuN2cPo ZJ7cbtGJzZ/M3OHQ5sThfTZDzfQ== X-Google-Smtp-Source: AGHT+IGGjU7PBZrvrHnLNf5obKj5kBUB8XFB1rd4PE+sHNfAWE9hvO3yrhYZmNlmnVSym+rgcrTvpw== X-Received: by 2002:a05:600c:4f84:b0:456:25aa:e9c0 with SMTP id 5b1f17b1804b1-45a2180d6b0mr58856545e9.14.1755463837641; Sun, 17 Aug 2025 13:50:37 -0700 (PDT) Received: from localhost ([109.238.218.228]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-3bb7f02578dsm10592058f8f.62.2025.08.17.13.50.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Aug 2025 13:50:37 -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] e2fsprogs: Fix build failure with gcc 15 Date: Sun, 17 Aug 2025 22:50:31 +0200 Message-ID: <20250817205033.3845672-1-martin.jansa@gmail.com> X-Mailer: git-send-email 2.50.1 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 ; Sun, 17 Aug 2025 20:50:43 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/222018 From: Khem Raj Backport a needed fix Signed-off-by: Khem Raj Signed-off-by: Richard Purdie Signed-off-by: Martin Jansa --- ...-libext2fs-fix-std-c23-build-failure.patch | 42 +++++++++++++++++++ .../e2fsprogs/e2fsprogs_1.47.0.bb | 1 + 2 files changed, 43 insertions(+) create mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-libext2fs-fix-std-c23-build-failure.patch diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-libext2fs-fix-std-c23-build-failure.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-libext2fs-fix-std-c23-build-failure.patch new file mode 100644 index 0000000000..01ab9d5afb --- /dev/null +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-libext2fs-fix-std-c23-build-failure.patch @@ -0,0 +1,42 @@ +From 72dcef02bee9924c4d5b3dc6e7ef4d07becebcc6 Mon Sep 17 00:00:00 2001 +From: Rudi Heitbaum +Date: Fri, 22 Nov 2024 12:36:32 +0000 +Subject: [PATCH] libext2fs: fix -std=c23 build failure + +gcc-15 switched to -std=c23 by default: + + https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=55e3bd376b2214e200fa76d12b67ff259b06c212 + +As a result `e2fsprogs` fails the build so only typedef int bool +for __STDC_VERSION__ <= 201710L (C17) + + ../../../lib/ext2fs/tdb.c:113:13: error: two or more data types in declaration specifiers + ../../../lib/ext2fs/tdb.c:113:1: warning: useless type name in empty declaration + 113 | typedef int bool; + | ^~~~~~~ + +https://github.com/tytso/e2fsprogs/issues/202 + +Upstream-Status: Backport [https://github.com/tytso/e2fsprogs/commit/49fd04d77b3244c6c6990be41142168eef373aef] +Signed-off-by: Rudi Heitbaum +Link: https://lore.kernel.org/r/Z0B60JhdvT9bpSQ6@6f91903e89da +Signed-off-by: Theodore Ts'o +Signed-off-by: Khem Raj +--- + lib/ext2fs/tdb.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/lib/ext2fs/tdb.c b/lib/ext2fs/tdb.c +index b07b2917..98dc95d8 100644 +--- a/lib/ext2fs/tdb.c ++++ b/lib/ext2fs/tdb.c +@@ -110,7 +110,9 @@ static char *rep_strdup(const char *s) + #endif + #endif + ++#if defined __STDC__ && defined __STDC_VERSION__ && __STDC_VERSION__ <= 201710L + typedef int bool; ++#endif + + #include "tdb.h" + diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.47.0.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.47.0.bb index 940b47c155..0288854527 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.47.0.bb +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.47.0.bb @@ -4,6 +4,7 @@ SRC_URI += "file://remove.ldconfig.call.patch \ file://run-ptest \ file://ptest.patch \ file://mkdir_p.patch \ + file://0001-libext2fs-fix-std-c23-build-failure.patch \ " SRC_URI:append:class-native = " \ file://e2fsprogs-fix-missing-check-for-permission-denied.patch \ From patchwork Sun Aug 17 20:50:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Jansa X-Patchwork-Id: 68692 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 F073BCA0EE4 for ; Sun, 17 Aug 2025 20:50:52 +0000 (UTC) Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by mx.groups.io with SMTP id smtpd.web10.60835.1755463841197089381 for ; Sun, 17 Aug 2025 13:50:41 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=K3kPo8fY; spf=pass (domain: gmail.com, ip: 209.85.221.44, mailfrom: martin.jansa@gmail.com) Received: by mail-wr1-f44.google.com with SMTP id ffacd0b85a97d-3b9e41101d4so1836910f8f.2 for ; Sun, 17 Aug 2025 13:50:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1755463839; x=1756068639; 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=F0pW4TgGSeMfcuV5u2HrtlOPQ5t4lhqr2hTjplKfbtQ=; b=K3kPo8fY0HiwxFZ1InRyQQH66rjweIWoiqL/7CPeScqoFRieUYEx+HTBRG8muWkyA7 yMs5ULJILcm+I+cQ/kb3rMqP80dBG1aU/2fUGDto5KE54gAURA6477Ym89GmKKCpCWP4 SZQzG51L377NAIwKEkZD+AILIHkzXDr4odTnID34UujwO10h+bcT0A/8OvVMvZeRPwz8 2/okjH99Yvnnh07gsorqIDbiZwZYDJbSc0+6qKVOENDXUOS5si8C8hI6kLG4H4/0XreS jsg5N1/7cdcXPM+k3Ks2DrXmrT6mTGenKXDXGIcFlymYm+7XNWHDwNfM4fOcSoIZyg3S Bb0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755463839; x=1756068639; 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=F0pW4TgGSeMfcuV5u2HrtlOPQ5t4lhqr2hTjplKfbtQ=; b=qGW7xogthVcHVBpHtyDfJsMXhgZnlSlwNtpolrYWf4R0U1y8oPzGCjtpAG38Gskgee E2lKfjDfc8Ta36t9pZj4h1X6YJZv0WrBn37Ppgt6efduPAx+CJg6ONxvooHFNfOeriZn M65yLc9NljgTmQG045EWoHMpwSe39Lv9xiZB1iQdHF+5ycN7ZLlw+YyHjsXnh1iZPNIv 05jYLw23lyI0gAZ5/BMTr4B54h54O+4SpLwTalJM85N4kwskMv6CwqHwFdK18YApXQKN FWIYT+h1IxbgWDVi1xEe/qagdReBsKbb2HJuXwRn0Ey1N773EmSNI7loEZIfXK2U7l5f mBGg== X-Gm-Message-State: AOJu0Yy/EgG4zCNnp/Swq+gLNT1023XmWrypqIg94xWRN2kl/g4I10+Y xkHtzKPAy2g8XLdzWKHciPZUHsSIgrmFv0g3Q4a93YzFmnYL5+qwlfmsQtrE7A== X-Gm-Gg: ASbGncvVQFVimQ+PSVu0Jzj+woFaT0KnX8LreyyM9VdfzvA1/ERfqI78lDmr9VS0A1x 1eQq3azLvsKK5//Hvz5rdFVmU6Pk8vm+UFE7w4GQ2+r1aW97NQclDwJWQyy9KE/lXlswBo4mFgO BsVL5ky7KW4RWoJ0bwY5w141ruLVz3d/qWBcK/piCmYuy6MIfN6+F7+xzxCrgPNKr/V2uBqCHrQ ZFNW254eUtMXr7xvvcnnxungbXzPbpFU8ZYagrEefKSE5bNBGBbnjOHM+M0xARkZ9UPd9r82OSM O9HBrxw0DNAXhLspAW/Ei2cOZtnZAAd/XHoIONWHuMPuRN020Xap1ZeHSWkVsdzUqBRXcoXFKsf 03Aw3aKkHwtijt4ImhIr8RbeSsw== X-Google-Smtp-Source: AGHT+IE4nsjCSf4tVzolVmteoEABIvD8QCIz5eNSZE9SSjd4fgcUG1nzYE0C76QL3TCpQaZDZtj7uw== X-Received: by 2002:a05:6000:4287:b0:3b9:1636:c443 with SMTP id ffacd0b85a97d-3bb694af47cmr7712615f8f.52.1755463839416; Sun, 17 Aug 2025 13:50:39 -0700 (PDT) Received: from localhost ([109.238.218.228]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-3bb5d089e07sm10365066f8f.0.2025.08.17.13.50.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Aug 2025 13:50:38 -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 2/3] parted: Fix build with GCC 15 Date: Sun, 17 Aug 2025 22:50:32 +0200 Message-ID: <20250817205033.3845672-2-martin.jansa@gmail.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250817205033.3845672-1-martin.jansa@gmail.com> References: <20250817205033.3845672-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 ; Sun, 17 Aug 2025 20:50:52 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/222019 From: Khem Raj Signed-off-by: Khem Raj Signed-off-by: Richard Purdie Signed-off-by: Martin Jansa --- ...CH-parted-fix-do_version-declaration.patch | 40 +++++++++++++++++++ meta/recipes-extended/parted/parted_3.6.bb | 1 + 2 files changed, 41 insertions(+) create mode 100644 meta/recipes-extended/parted/files/0001-bug-74444-PATCH-parted-fix-do_version-declaration.patch diff --git a/meta/recipes-extended/parted/files/0001-bug-74444-PATCH-parted-fix-do_version-declaration.patch b/meta/recipes-extended/parted/files/0001-bug-74444-PATCH-parted-fix-do_version-declaration.patch new file mode 100644 index 0000000000..a8ea7ec4f7 --- /dev/null +++ b/meta/recipes-extended/parted/files/0001-bug-74444-PATCH-parted-fix-do_version-declaration.patch @@ -0,0 +1,40 @@ +From eb6bb2e8dfc78ca1a187d07ea29b23a805c61794 Mon Sep 17 00:00:00 2001 +From: Rudi Heitbaum +Date: Wed, 20 Nov 2024 12:22:22 +0000 +Subject: [PATCH] bug#74444: [PATCH] parted: fix do_version declaration + +With gcc 15-20241117 compile fails with the below error, update the +do_version declaration to match the header in command.h + +../../parted/parted.c: In function '_init_commands': +../../parted/parted.c:2469:9: error: passing argument 2 of 'command_create' from incompatible pointer type [-Wincompatible-pointer-types] + 2469 | do_version, + | ^~~~~~~~~~ + | | + | int (*)(void) +In file included from ../../parted/parted.c:28: +../../parted/command.h:35:39: note: expected 'int (*)(PedDevice **, PedDisk **)' {aka 'int (*)(struct _PedDevice **, struct _PedDisk **)'} but argument is of type 'int (*)(void)' + 35 | int (*method) (PedDevice** dev, PedDisk** diskp), + | ~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/parted.git/commit/?id=16343bda6ce0d41edf43f8dac368db3bbb63d271] +Signed-off-by: Rudi Heitbaum +Signed-off-by: Brian C. Lane +Signed-off-by: Khem Raj +--- + parted/parted.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/parted/parted.c b/parted/parted.c +index 3abb52f..fc2aeba 100644 +--- a/parted/parted.c ++++ b/parted/parted.c +@@ -2172,7 +2172,7 @@ do_unit (PedDevice** dev, PedDisk** diskp) + } + + static int +-do_version () ++do_version (PedDevice** dev, PedDisk** diskp) + { + printf ("\n%s\n%s", + prog_name, diff --git a/meta/recipes-extended/parted/parted_3.6.bb b/meta/recipes-extended/parted/parted_3.6.bb index a537ef74db..0e79a2e837 100644 --- a/meta/recipes-extended/parted/parted_3.6.bb +++ b/meta/recipes-extended/parted/parted_3.6.bb @@ -10,6 +10,7 @@ SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.xz \ file://fix-doc-mandir.patch \ file://0001-fs-Add-libuuid-to-linker-flags-for-libparted-fs-resi.patch \ file://autoconf-2.73.patch \ + file://0001-bug-74444-PATCH-parted-fix-do_version-declaration.patch \ file://run-ptest \ " From patchwork Sun Aug 17 20:50:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Martin Jansa X-Patchwork-Id: 68693 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 EF41CCA0EDC for ; Sun, 17 Aug 2025 20:50:52 +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.web11.60586.1755463843041243122 for ; Sun, 17 Aug 2025 13:50:43 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=VqpsVMeS; 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-45a1b0bd237so27448675e9.2 for ; Sun, 17 Aug 2025 13:50:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1755463841; x=1756068641; 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=Zr2eh3/3qitbJkseIF/XB+S/Mm2YJ8Q/9Y3v4iuHJM8=; b=VqpsVMeSfd6biR6n4IER3//diD9RhUtB48z/I7n2Qn1TJKruhpQoIfjDl6PItWWZuj xX8DdSHdNz1t7HMUDXPyLNXY73nLi/wTGe1btKEFe2ddUfCR2ltNlK6pBdbLUzCSz3ih 2463LyYLxlfwnAYumKnk4v5Q+Nsr3n3K8SecsFQLjqqrn0yZCb2RubWkl44Lcmx7wgkZ I4GcmOccGkdd0aB78RgsEc65ZPOLZJLt4aemTvVscFaB2x9gchUgiAw3g5Fnd/mHyCYk xbhVQJl5f3FSzQiSmSr+gI8mb30GY0CKtLbSBHWgwBkUldE59P9nTCd6s3RtXVschkNl nkTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755463841; x=1756068641; 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=Zr2eh3/3qitbJkseIF/XB+S/Mm2YJ8Q/9Y3v4iuHJM8=; b=UbKfXhCSVeS5gp2WoeH5iHZIB2qZiana3p1Ow+VNJ/f99BJVbVy4bmXNd06LVyYVq0 QA3Fu91SEgIXwWx6dFSm46dhgacsqQYthuv3yeR2ZX2Rt00s2GYv20FIA0unXtLTYe2V g1jVV4rRHXTi11Kgk/Bq/0pfRVjFewFumpiPGOmLEyo7SriZOzsN6B8fKn6feVScPo1C ABk1zuvTUmTP5YQhwd4zlBDcftN3YOwSxNdFE4PpkGm/Ai8DMD9FrbtylOpiXQtJ+8n0 SoGXN8XHv5shJTQt8ZajJ40sGoLOBHS9Jic7UvSuKFasz8gZ0udih0h1hwL/wmSS0y1M CccQ== X-Gm-Message-State: AOJu0Yz8Ke9BHmyzKkgZtEbQONF1zHsRvVMiidYgs1xj5+zfng1NHLs4 43RlXT8/nCS4emHbck3J1Pls+reuY4TW72UtjKQUuAtT0p2dnXvtdAoAU1qaPA== X-Gm-Gg: ASbGncudHp3xz0FiRX1+7z6WSGFUmquFvMZyBNZ4E7WahI64AZ5Mu3AJazKP7qJaDhD D8vk5cB74vnMjIvw/hIxyEtc3S/6NrkfaNqLbbCxf3pneLAOjl4y/fdEjvJXkl6c1XiXT7vZCRe m3bfJIfeFeRUvKtseNFh99cxxG3e6xZ4v7LA/VRvMZiYtJwBAQ0Ax0rgigyw27Vp/Evj5CoM7Kl rc0Sbvzywq9uUU4eULr1gSEXcUbjDGi+3IaRBhGnn6hhGj8v28LCAF+OMFK3mRsNm+vQVT4tu8w QuZttXiZhBwfOuuSkbQY1y/TYo4CCYsRX5RI5KoejG/Y5Qdsik5JsdC7tfpj13bl0/cq5gt1Mkm xuQp6d+Fo376eMITkABBuxn9zEw== X-Google-Smtp-Source: AGHT+IH9h040tivV777wmjEs0fNIYiqxihMKC/8XA3FkWmkfSQWXS0xSFqV01kHDfxiTQC7tdkoSlg== X-Received: by 2002:a05:6000:1884:b0:3b7:90f3:cd8a with SMTP id ffacd0b85a97d-3bb693b1f13mr7266456f8f.49.1755463841290; Sun, 17 Aug 2025 13:50:41 -0700 (PDT) Received: from localhost ([109.238.218.228]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-3bb652f75aesm10337039f8f.23.2025.08.17.13.50.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Aug 2025 13:50:40 -0700 (PDT) From: martin.jansa@gmail.com To: openembedded-core@lists.openembedded.org Cc: steve@sakoman.com, Martin Jansa Subject: [scarthgap][PATCH 3/3] cairo: fix build with gcc-15 on host Date: Sun, 17 Aug 2025 22:50:33 +0200 Message-ID: <20250817205033.3845672-3-martin.jansa@gmail.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250817205033.3845672-1-martin.jansa@gmail.com> References: <20250817205033.3845672-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 ; Sun, 17 Aug 2025 20:50:52 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/222020 From: Martin Jansa * backports from 1.18.2 used since: https://git.openembedded.org/openembedded-core/commit/?id=070d79c8adec7e0a8862019cf61910a59b18613a * fixes build on hosts with gcc-15 (e.g. ubuntu-25.10) ../cairo-1.18.0/test/pdiff/pdiff.h:22:13: error: ‘bool’ cannot be defined via ‘typedef’ 22 | typedef int bool; | ^~~~ ../cairo-1.18.0/test/pdiff/pdiff.h:22:13: note: ‘bool’ is a keyword with ‘-std=c23’ onwards ../cairo-1.18.0/test/pdiff/pdiff.h:22:1: warning: useless type name in empty declaration 22 | typedef int bool; | ^~~~~~~ Signed-off-by: Martin Jansa --- .../cairo/cairo/0001-Require-C11.patch | 25 +++++++++++++++++++ .../cairo/cairo/0002-Meson-Require-C-11.patch | 22 ++++++++++++++++ meta/recipes-graphics/cairo/cairo_1.18.0.bb | 2 ++ 3 files changed, 49 insertions(+) create mode 100644 meta/recipes-graphics/cairo/cairo/0001-Require-C11.patch create mode 100644 meta/recipes-graphics/cairo/cairo/0002-Meson-Require-C-11.patch diff --git a/meta/recipes-graphics/cairo/cairo/0001-Require-C11.patch b/meta/recipes-graphics/cairo/cairo/0001-Require-C11.patch new file mode 100644 index 0000000000..a2e888e46b --- /dev/null +++ b/meta/recipes-graphics/cairo/cairo/0001-Require-C11.patch @@ -0,0 +1,25 @@ +From de2452228814e804b103dfa7c2d37b3a216c6155 Mon Sep 17 00:00:00 2001 +From: Adrian Johnson +Date: Sun, 28 Apr 2024 21:31:41 +0930 +Subject: [PATCH] Require C11 + +Upstream-Status: Backport [https://gitlab.freedesktop.org/cairo/cairo/-/commit/b60f47dfd5bbe98aec43f6c356ba3be9a1b7989e] +--- + meson.build | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/meson.build b/meson.build +index 9100152..f8432fd 100644 +--- a/meson.build ++++ b/meson.build +@@ -1,7 +1,8 @@ + project('cairo', 'c', 'cpp', +- meson_version: '>= 0.59.0', ++ meson_version: '>= 1.3.0', + version: run_command(find_program('version.py'), check: true).stdout().strip(), +- default_options: ['warning_level=2'], ++ default_options: ['c_std=gnu11,c11', ++ 'warning_level=2'], + ) + + freetype_required_version = '>= 9.7.3' diff --git a/meta/recipes-graphics/cairo/cairo/0002-Meson-Require-C-11.patch b/meta/recipes-graphics/cairo/cairo/0002-Meson-Require-C-11.patch new file mode 100644 index 0000000000..b395fbbc8b --- /dev/null +++ b/meta/recipes-graphics/cairo/cairo/0002-Meson-Require-C-11.patch @@ -0,0 +1,22 @@ +From d9cc95b94b2bb1e67f2095cda484d4a8a63aba10 Mon Sep 17 00:00:00 2001 +From: Luca Bacci +Date: Thu, 16 Jan 2025 16:48:12 +0100 +Subject: [PATCH] Meson: Require C++11 + +Upstream-Status: Backport [https://gitlab.freedesktop.org/cairo/cairo/-/commit/dfd06ab3884d79de3b5bac782d1e8b2a0bd791ab] +--- + meson.build | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/meson.build b/meson.build +index f8432fd..85434d2 100644 +--- a/meson.build ++++ b/meson.build +@@ -2,6 +2,7 @@ project('cairo', 'c', 'cpp', + meson_version: '>= 1.3.0', + version: run_command(find_program('version.py'), check: true).stdout().strip(), + default_options: ['c_std=gnu11,c11', ++ 'cpp_std=gnu++11,c++11', + 'warning_level=2'], + ) + diff --git a/meta/recipes-graphics/cairo/cairo_1.18.0.bb b/meta/recipes-graphics/cairo/cairo_1.18.0.bb index 4c97e973d0..f1a87ccb3f 100644 --- a/meta/recipes-graphics/cairo/cairo_1.18.0.bb +++ b/meta/recipes-graphics/cairo/cairo_1.18.0.bb @@ -30,6 +30,8 @@ DEPENDS = "fontconfig freetype glib-2.0 libpng pixman zlib" SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.xz \ file://cairo-get_bitmap_surface-bsc1036789-CVE-2017-7475.diff \ + file://0001-Require-C11.patch \ + file://0002-Meson-Require-C-11.patch \ " SRC_URI[sha256sum] = "243a0736b978a33dee29f9cca7521733b78a65b5418206fef7bd1c3d4cf10b64"