diff options
-rw-r--r-- | meta-oe/recipes-devtools/libtoml11/files/0001-fix-add-missing-zero-initialization-to-region.patch | 35 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/libtoml11/libtoml11_4.3.0.bb (renamed from meta-oe/recipes-devtools/libtoml11/libtoml11_4.2.0.bb) | 3 |
2 files changed, 1 insertions, 37 deletions
diff --git a/meta-oe/recipes-devtools/libtoml11/files/0001-fix-add-missing-zero-initialization-to-region.patch b/meta-oe/recipes-devtools/libtoml11/files/0001-fix-add-missing-zero-initialization-to-region.patch deleted file mode 100644 index cb3d10ee72..0000000000 --- a/meta-oe/recipes-devtools/libtoml11/files/0001-fix-add-missing-zero-initialization-to-region.patch +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | From 9c7cef94a551cfdbbe2cce262c29221e22643d84 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Ale=C5=A1=20Mat=C4=9Bj?= <amatej@redhat.com> | ||
3 | Date: Mon, 19 Aug 2024 06:35:03 +0200 | ||
4 | Subject: [PATCH] fix: add missing zero initialization to region | ||
5 | |||
6 | Fixes below error: | ||
7 | |||
8 | /build/tmp-glibc/work/core2-64-wrs-linux/libtoml11/1_4.2.0-r0/git/include/toml11/fwd/../fwd/../fwd/region_fwd.hpp:49:5: error: '<unnamed>.toml::detail::region::first_' is used uninitialized [-Werror=uninitialized] | ||
9 | 49 | region(region&&) = default; | ||
10 | | ^~~~~~ | ||
11 | |||
12 | Upstream-Status: Backport [https://github.com/ToruNiina/toml11/commit/9c7cef94a551cfdbbe2cce262c29221e22643d84] | ||
13 | |||
14 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | ||
15 | --- | ||
16 | include/toml11/fwd/region_fwd.hpp | 3 ++- | ||
17 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
18 | |||
19 | diff --git a/include/toml11/fwd/region_fwd.hpp b/include/toml11/fwd/region_fwd.hpp | ||
20 | index b40317d..26f1a9b 100644 | ||
21 | --- a/include/toml11/fwd/region_fwd.hpp | ||
22 | +++ b/include/toml11/fwd/region_fwd.hpp | ||
23 | @@ -34,7 +34,8 @@ class region | ||
24 | // a value that is constructed manually does not have input stream info | ||
25 | region() | ||
26 | : source_(nullptr), source_name_(""), length_(0), | ||
27 | - first_line_(0), first_column_(0), last_line_(0), last_column_(0) | ||
28 | + first_(0), first_line_(0), first_column_(0), last_(0), last_line_(0), | ||
29 | + last_column_(0) | ||
30 | {} | ||
31 | |||
32 | // a value defined in [first, last). | ||
33 | -- | ||
34 | 2.34.1 | ||
35 | |||
diff --git a/meta-oe/recipes-devtools/libtoml11/libtoml11_4.2.0.bb b/meta-oe/recipes-devtools/libtoml11/libtoml11_4.3.0.bb index 758e258a57..9f265ea19a 100644 --- a/meta-oe/recipes-devtools/libtoml11/libtoml11_4.2.0.bb +++ b/meta-oe/recipes-devtools/libtoml11/libtoml11_4.3.0.bb | |||
@@ -11,14 +11,13 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=44d1fcf70c7aa6991533c38daf7befa3" | |||
11 | 11 | ||
12 | PE = "1" | 12 | PE = "1" |
13 | 13 | ||
14 | SRCREV = "cc0bee4fd46ea1f5db147d63ea545208cc9e8405" | 14 | SRCREV = "499be3c177bcf9b42848d5d9567153e4edfcbc8a" |
15 | SRCREV_json = "9cca280a4d0ccf0c08f47a99aa71d1b0e52f8d03" | 15 | SRCREV_json = "9cca280a4d0ccf0c08f47a99aa71d1b0e52f8d03" |
16 | SRCREV_doctest = "ae7a13539fb71f270b87eb2e874fbac80bc8dda2" | 16 | SRCREV_doctest = "ae7a13539fb71f270b87eb2e874fbac80bc8dda2" |
17 | 17 | ||
18 | SRC_URI = "git://github.com/ToruNiina/toml11;branch=main;protocol=https \ | 18 | SRC_URI = "git://github.com/ToruNiina/toml11;branch=main;protocol=https \ |
19 | git://github.com/nlohmann/json;destsuffix=git/tests/extlib/json;name=json;branch=develop;protocol=https \ | 19 | git://github.com/nlohmann/json;destsuffix=git/tests/extlib/json;name=json;branch=develop;protocol=https \ |
20 | git://github.com/doctest/doctest;destsuffix=git/tests/extlib/doctest;name=doctest;branch=master;protocol=https \ | 20 | git://github.com/doctest/doctest;destsuffix=git/tests/extlib/doctest;name=doctest;branch=master;protocol=https \ |
21 | file://0001-fix-add-missing-zero-initialization-to-region.patch \ | ||
22 | file://run-ptest \ | 21 | file://run-ptest \ |
23 | " | 22 | " |
24 | SRCREV_FORMAT = "json_doctest" | 23 | SRCREV_FORMAT = "json_doctest" |