From e7e4a36f21107342a65b3987fa655810f8c7271a Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Thu, 15 Oct 2026 11:25:46 +0200 Subject: [PATCH] libtoml11: remove package The libtoml11 package is now included in openembedded-core. Signed-off-by: Adam Duskett Signed-off-by: Khem Raj --- .../include/ptest-packagelists-meta-oe.inc | 1 - ...move-more-whitespaces-after-operator.patch | 34 -------------- .../0001-Remove-whitespace-in-operator.patch | 46 ------------------- .../libtoml11/files/run-ptest | 13 ------ .../libtoml11/libtoml11_4.4.0.bb | 39 ---------------- 5 files changed, 133 deletions(-) delete mode 100644 meta-oe/recipes-devtools/libtoml11/files/0001-Remove-more-whitespaces-after-operator.patch delete mode 100644 meta-oe/recipes-devtools/libtoml11/files/0001-Remove-whitespace-in-operator.patch delete mode 100755 meta-oe/recipes-devtools/libtoml11/files/run-ptest delete mode 100644 meta-oe/recipes-devtools/libtoml11/libtoml11_4.4.0.bb diff --git a/meta-oe/conf/include/ptest-packagelists-meta-oe.inc b/meta-oe/conf/include/ptest-packagelists-meta-oe.inc index 46cf9254df..0e2df75d3f 100644 --- a/meta-oe/conf/include/ptest-packagelists-meta-oe.inc +++ b/meta-oe/conf/include/ptest-packagelists-meta-oe.inc @@ -42,7 +42,6 @@ PTESTS_FAST_META_OE = "\ libssh \ libteam \ libtinyxml2 \ - libtoml11 \ libxml++-5.0 \ libyang \ lmdb \ diff --git a/meta-oe/recipes-devtools/libtoml11/files/0001-Remove-more-whitespaces-after-operator.patch b/meta-oe/recipes-devtools/libtoml11/files/0001-Remove-more-whitespaces-after-operator.patch deleted file mode 100644 index 5bff81eaf6..0000000000 --- a/meta-oe/recipes-devtools/libtoml11/files/0001-Remove-more-whitespaces-after-operator.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 6af7de3d5eaae59c53c42aab8eca1e1e9a365da5 Mon Sep 17 00:00:00 2001 -From: Steffen Winter -Date: Thu, 25 Dec 2025 20:48:02 +0100 -Subject: [PATCH] Remove more whitespaces after operator"" - -Upstream-Status: Submitted [https://github.com/ToruNiina/toml11/pull/306] -Signed-off-by: Khem Raj ---- - include/toml11/fwd/literal_fwd.hpp | 4 ++-- - include/toml11/impl/literal_impl.hpp | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - ---- a/include/toml11/fwd/literal_fwd.hpp -+++ b/include/toml11/fwd/literal_fwd.hpp -@@ -24,7 +24,7 @@ inline namespace toml_literals - #if defined(TOML11_HAS_CHAR8_T) - // value of u8"" literal has been changed from char to char8_t and char8_t is - // NOT compatible to char --::toml::value operator"" _toml(const char8_t* str, std::size_t len); -+::toml::value operator""_toml(const char8_t* str, std::size_t len); - #endif - - } // toml_literals ---- a/include/toml11/impl/literal_impl.hpp -+++ b/include/toml11/impl/literal_impl.hpp -@@ -146,7 +146,7 @@ operator""_toml(const char* str, std::si - // value of u8"" literal has been changed from char to char8_t and char8_t is - // NOT compatible to char - TOML11_INLINE ::toml::value --operator"" _toml(const char8_t* str, std::size_t len) -+operator""_toml(const char8_t* str, std::size_t len) - { - if(len == 0) - { diff --git a/meta-oe/recipes-devtools/libtoml11/files/0001-Remove-whitespace-in-operator.patch b/meta-oe/recipes-devtools/libtoml11/files/0001-Remove-whitespace-in-operator.patch deleted file mode 100644 index 9516ee5cb1..0000000000 --- a/meta-oe/recipes-devtools/libtoml11/files/0001-Remove-whitespace-in-operator.patch +++ /dev/null @@ -1,46 +0,0 @@ -From dee78f822d8a5b985e565e5c1ef42a59557aa8fc Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 7 Mar 2025 11:35:46 -0800 -Subject: [PATCH] Remove whitespace in operator"" - -Clang 20+ errors about this whitespace. - -Fixes -include/toml11/impl/../fwd/literal_fwd.hpp:22:26: error: identifier '_toml' preceded by whitespace in a literal operator declaration is deprecated [-Werror,-Wdeprecated-literal-operator] -| 22 | ::toml::value operator"" _toml(const char* str, std::size_t len); -| | ~~~~~~~~~~~^~~~~ -| | operator""_toml - -Upstream-Status: Backport [https://github.com/ToruNiina/toml11/commit/dee78f822d8a5b985e565e5c1ef42a59557aa8fc] -Signed-off-by: Khem Raj ---- - include/toml11/fwd/literal_fwd.hpp | 2 +- - include/toml11/impl/literal_impl.hpp | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/include/toml11/fwd/literal_fwd.hpp b/include/toml11/fwd/literal_fwd.hpp -index e46612c..82f62b7 100644 ---- a/include/toml11/fwd/literal_fwd.hpp -+++ b/include/toml11/fwd/literal_fwd.hpp -@@ -19,7 +19,7 @@ inline namespace literals - inline namespace toml_literals - { - --::toml::value operator"" _toml(const char* str, std::size_t len); -+::toml::value operator""_toml(const char* str, std::size_t len); - - #if defined(TOML11_HAS_CHAR8_T) - // value of u8"" literal has been changed from char to char8_t and char8_t is -diff --git a/include/toml11/impl/literal_impl.hpp b/include/toml11/impl/literal_impl.hpp -index e8298c2..067d4ed 100644 ---- a/include/toml11/impl/literal_impl.hpp -+++ b/include/toml11/impl/literal_impl.hpp -@@ -115,7 +115,7 @@ inline namespace toml_literals - { - - TOML11_INLINE ::toml::value --operator"" _toml(const char* str, std::size_t len) -+operator""_toml(const char* str, std::size_t len) - { - if(len == 0) - { diff --git a/meta-oe/recipes-devtools/libtoml11/files/run-ptest b/meta-oe/recipes-devtools/libtoml11/files/run-ptest deleted file mode 100755 index 4da9e68cc5..0000000000 --- a/meta-oe/recipes-devtools/libtoml11/files/run-ptest +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env sh - -cd tests || exit 1 - -rm -rf tests.log - -for atest in test_* ; do - if ./"${atest}" >> tests.log 2>&1; then - echo "PASS: ${atest}" - else - echo "FAIL: ${atest}" - fi -done diff --git a/meta-oe/recipes-devtools/libtoml11/libtoml11_4.4.0.bb b/meta-oe/recipes-devtools/libtoml11/libtoml11_4.4.0.bb deleted file mode 100644 index 49f9840f06..0000000000 --- a/meta-oe/recipes-devtools/libtoml11/libtoml11_4.4.0.bb +++ /dev/null @@ -1,39 +0,0 @@ -SUMMARY = "TOML for Modern C++" -DESCRIPTION = "toml11 is a feature-rich TOML language library for \ - C++11/14/17/20." - -HOMEPAGE = "https://github.com/ToruNiina/toml11" -BUGTRACKER = "https://github.com/ToruNiina/toml11/issues" -CVE_PRODUCT = "libtoml11" - -SECTION = "libs" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=44d1fcf70c7aa6991533c38daf7befa3" - -PE = "1" - -SRC_URI = "\ - gitsm://github.com/ToruNiina/toml11.git;protocol=https;branch=main;tag=v${PV} \ - file://0001-Remove-whitespace-in-operator.patch \ - file://0001-Remove-more-whitespaces-after-operator.patch \ - file://run-ptest \ -" -SRCREV = "be08ba2be2a964edcdb3d3e3ea8d100abc26f286" - -inherit cmake ptest - -CXXFLAGS:append:toolchain-clang = " -Wno-error=c2y-extensions" - -EXTRA_OECMAKE += "-DTOML11_PRECOMPILE=ON \ - -DTOML11_BUILD_TESTS=${@bb.utils.contains("PTEST_ENABLED", "1", "ON", "OFF", d)} \ -" - -ALLOW_EMPTY:${PN} = "1" - -do_install_ptest () { - install -d ${D}${PTEST_PATH}/tests - cp -r ${B}/tests/test_* ${D}${PTEST_PATH}/tests -} - -BBCLASSEXTEND = "native nativesdk"