From b44581a6ce8f532d90229563fb9731b3f054d87f Mon Sep 17 00:00:00 2001 From: Ankur Tyagi Date: Thu, 6 Aug 2026 09:36:54 +1200 Subject: [PATCH] flatcc: upgrade 0.6.2 -> 0.6.3 Dropped setting PV in the recipe and included tag in the SRC_URI. Also dropped patches that are now merged in the upstream version. Changelog: https://github.com/dvidelabs/flatcc/releases/tag/v0.6.3 Signed-off-by: Ankur Tyagi Signed-off-by: Khem Raj --- ...ndard-version-23-for-__fallthrough__.patch | 31 ----------- .../0002-allow-build-with-cmake-4.patch | 52 ------------------- .../flatcc/{flatcc_git.bb => flatcc_0.6.3.bb} | 10 +--- 3 files changed, 2 insertions(+), 91 deletions(-) delete mode 100644 meta-oe/recipes-devtools/flatcc/flatcc/0001-Check-for-C-standard-version-23-for-__fallthrough__.patch delete mode 100644 meta-oe/recipes-devtools/flatcc/flatcc/0002-allow-build-with-cmake-4.patch rename meta-oe/recipes-devtools/flatcc/{flatcc_git.bb => flatcc_0.6.3.bb} (66%) diff --git a/meta-oe/recipes-devtools/flatcc/flatcc/0001-Check-for-C-standard-version-23-for-__fallthrough__.patch b/meta-oe/recipes-devtools/flatcc/flatcc/0001-Check-for-C-standard-version-23-for-__fallthrough__.patch deleted file mode 100644 index c9ff55a167..0000000000 --- a/meta-oe/recipes-devtools/flatcc/flatcc/0001-Check-for-C-standard-version-23-for-__fallthrough__.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 7c199e3b191a6f714694035f1eba40112e71675c Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 1 Feb 2024 18:41:51 -0800 -Subject: [PATCH] Check for C standard version >= 23 for [[__fallthrough__]] - -This avoids warnings with clang-18+ e.g. - -pprintint.h:256:6: error: [[]] attributes are a C23 extension [-Werror,-Wc23-extensions] - -Upstream-Status: Submitted [https://github.com/dvidelabs/flatcc/pull/273] -Signed-off-by: Khem Raj ---- - include/flatcc/portable/pattributes.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/flatcc/portable/pattributes.h b/include/flatcc/portable/pattributes.h -index 9240fa3..dd4918a 100644 ---- a/include/flatcc/portable/pattributes.h -+++ b/include/flatcc/portable/pattributes.h -@@ -57,7 +57,7 @@ extern "C" { - - - /* https://en.cppreference.com/w/c/language/attributes/fallthrough */ --#if PORTABLE_HAS_C_ATTRIBUTE(__fallthrough__) -+#if PORTABLE_HAS_C_ATTRIBUTE(__fallthrough__) && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 202311L - # define pattribute_fallthrough [[__fallthrough__]] - #elif PORTABLE_HAS_ATTRIBUTE(__fallthrough__) - # define pattribute_fallthrough __attribute__((__fallthrough__)) --- -2.43.0 - diff --git a/meta-oe/recipes-devtools/flatcc/flatcc/0002-allow-build-with-cmake-4.patch b/meta-oe/recipes-devtools/flatcc/flatcc/0002-allow-build-with-cmake-4.patch deleted file mode 100644 index b0b0cedbfb..0000000000 --- a/meta-oe/recipes-devtools/flatcc/flatcc/0002-allow-build-with-cmake-4.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 4a53680194dac08b8f0247a7f3459c95ce0fddbb Mon Sep 17 00:00:00 2001 -From: Alper Ak -Date: Wed, 9 Jul 2025 13:03:33 +0300 -Subject: [PATCH] cmake: Set minimum required version to 3.5 for CMake 4+ - compatibility - -Fix: - -| CMake Error at CMakeLists.txt:2 (cmake_minimum_required): -| Compatibility with CMake < 3.5 has been removed from CMake. -| -| Update the VERSION argument value. Or, use the ... syntax -| to tell CMake that the project requires at least but has been updated -| to work with policies introduced by or earlier. -| -| Or, add -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to try configuring anyway. -| -| -| -- Configuring incomplete, errors occurred! - -Upstream-Status: Submitted [https://github.com/dvidelabs/flatcc/pull/349] - -Signed-off-by: Alper Ak ---- - CMakeLists.txt | 2 +- - external/hash/CMakeLists.txt | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index cb6715a..b69b0bb 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,5 +1,5 @@ - # Ubuntu 14.04 (Trusty) --cmake_minimum_required (VERSION 2.8.12.2) -+cmake_minimum_required (VERSION 3.5) - # Centos 7 - #cmake_minimum_required (VERSION 2.8.11) - #cmake_minimum_required (VERSION 2.8) -diff --git a/external/hash/CMakeLists.txt b/external/hash/CMakeLists.txt -index 7b7d990..12eb3da 100644 ---- a/external/hash/CMakeLists.txt -+++ b/external/hash/CMakeLists.txt -@@ -1,4 +1,4 @@ --cmake_minimum_required (VERSION 3.0.2) -+cmake_minimum_required (VERSION 3.5) - - project (HashTest) - --- -2.43.0 - diff --git a/meta-oe/recipes-devtools/flatcc/flatcc_git.bb b/meta-oe/recipes-devtools/flatcc/flatcc_0.6.3.bb similarity index 66% rename from meta-oe/recipes-devtools/flatcc/flatcc_git.bb rename to meta-oe/recipes-devtools/flatcc/flatcc_0.6.3.bb index a4bdda162d..d330be7fed 100644 --- a/meta-oe/recipes-devtools/flatcc/flatcc_git.bb +++ b/meta-oe/recipes-devtools/flatcc/flatcc_0.6.3.bb @@ -6,14 +6,8 @@ SECTION = "devel/lib" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=b3d8fb7158bf7e2600ba3191428dc4ef" -PV = "0.6.2+git" - -SRC_URI = " \ - git://github.com/dvidelabs/flatcc.git;protocol=https;branch=master \ - file://0001-Check-for-C-standard-version-23-for-__fallthrough__.patch \ - file://0002-allow-build-with-cmake-4.patch \ -" -SRCREV = "1653ec964730ec7d9892a08a1695ada6d20f5196" +SRC_URI = "git://github.com/dvidelabs/flatcc.git;protocol=https;branch=master;tag=v${PV}" +SRCREV = "503799885b5517ea9d316c17e35471178c09e35a" inherit cmake