gn: update to latest
PATCH 1/2 gn: update to latest
Brings fixes to build with gcc-13
--- meta-arm/recipes-devtools/gn/gn_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-arm/recipes-devtools/gn/gn_git.bb +1 -1
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=0fca02217a5d49a14dfe2d11837bb34d" SRC_URI = "git://gn.googlesource.com/gn;protocol=https;branch=main \ file://0001-Replace-lstat64-stat64-functions-on-linux.patch" -SRCREV = "edf6ef4b06b42c58292faea78498aff76bdf68ed" +SRCREV = "4bd1a77e67958fb7f6739bd4542641646f264e5d" PV = "0+git${SRCPV}" S = "${WORKDIR}/git"
Signature · 1 line
2.41.0
PATCH 2/2 gn: Fix build with gcc13
--- ...Remove-redundant-move-in-return-stat.patch | 43 +++++++++++++++++++ meta-arm/recipes-devtools/gn/gn_git.bb | 1 + 2 files changed, 44 insertions(+) create mode 100644 meta-arm/recipes-devtools/gn/gn/0001-desc_builder.cc-Remove-redundant-move-in-return-stat.patch
meta-arm/recipes-devtools/gn/gn/0001-desc_builder.cc-Remove-redundant-move-in-return-stat.patch new file +43 -0
@@ -0,0 +1,43 @@ +From 45673f4f62eb063d6d5aa0ad68a6171936ad9347 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Tue, 24 Jan 2023 00:13:57 -0800 +Subject: [PATCH] desc_builder.cc: Remove redundant move in return statement + +Fixes build with gcc13 + +../git/src/gn/desc_builder.cc: In member function 'base::Value {anonymous}::BaseDescBuilder::ToBaseValue(const Scope*)': +../git/src/gn/desc_builder.cc:179:21: error: redundant move in return statement [-Werror=redundant-move] + 179 | return std::move(res); + | ~~~~~~~~~^~~~~ + +Upstream-Status: Submitted [https://gn-review.googlesource.com/c/gn/+/15000] +Signed-off-by: Khem Raj <[email protected]> +--- + src/gn/desc_builder.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/gn/desc_builder.cc b/src/gn/desc_builder.cc +index 444a5e02..3ef170c3 100644 +--- a/src/gn/desc_builder.cc ++++ b/src/gn/desc_builder.cc +@@ -167,7 +167,7 @@ class BaseDescBuilder { + base::ListValue res; + for (const auto& v : vector) + res.GetList().emplace_back(ToBaseValue(v)); +- return std::move(res); ++ return res; + } + + base::Value ToBaseValue(const Scope* scope) { +@@ -176,7 +176,7 @@ class BaseDescBuilder { + scope->GetCurrentScopeValues(&map); + for (const auto& v : map) + res.SetKey(v.first, ToBaseValue(v.second)); +- return std::move(res); ++ return res; + } + + base::Value ToBaseValue(const Value& val) { +-- +2.39.1 +
meta-arm/recipes-devtools/gn/gn_git.bb +1 -0
@@ -5,6 +5,7 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=0fca02217a5d49a14dfe2d11837bb34d" SRC_URI = "git://gn.googlesource.com/gn;protocol=https;branch=main \ + file://0001-desc_builder.cc-Remove-redundant-move-in-return-stat.patch \ file://0001-Replace-lstat64-stat64-functions-on-linux.patch" SRCREV = "4bd1a77e67958fb7f6739bd4542641646f264e5d" PV = "0+git${SRCPV}"
Signature · 1 line
2.41.0
Re: [meta-arm] [PATCH 2/2] gn: Fix build with gcc13
This breaks the build with gcc12.2 though:
2023-06-19 14:48:07 - INFO - | ../git/src/gn/desc_builder.cc: In member function ‘base::Value {anonymous}::BaseDescBuilder::ToBaseValue(const Scope*)’:
2023-06-19 14:48:07 - INFO - | ../git/src/gn/desc_builder.cc:180:12: error: use of deleted function ‘base::Value::Value(const base::Value&)’
2023-06-19 14:48:07 - INFO - | 180 | return res;
2023-06-19 14:48:07 - INFO - | | ^~~
2023-06-19 14:48:07 - INFO - | In file included from ../git/src/gn/commands.h:14,
2023-06-19 14:48:07 - INFO - | from ../git/src/gn/desc_builder.cc:10:
2023-06-19 14:48:07 - INFO - | ../git/src/base/values.h:367:3: note: declared here
2023-06-19 14:48:07 - INFO - | 367 | Value(const Value&) = delete;
2023-06-19 14:48:07 - INFO - | | ^~~~~
2023-06-19 14:48:07 - INFO - | ../git/src/gn/desc_builder.cc: In instantiation of ‘base::Value {anonymous}::BaseDescBuilder::ToBaseValue(const std::vector<T>&) [with T = Value]’:
2023-06-19 14:48:07 - INFO - | ../git/src/gn/desc_builder.cc:194:44: required from here
2023-06-19 14:48:07 - INFO - | ../git/src/gn/desc_builder.cc:171:12: error: use of deleted function ‘base::Value::Value(const base::Value&)’
2023-06-19 14:48:07 - INFO - | 171 | return res;
2023-06-19 14:48:07 - INFO - | | ^~~
2023-06-19 14:48:07 - INFO - | In file included from ../git/src/gn/commands.h:14,
2023-06-19 14:48:07 - INFO - | from ../git/src/gn/desc_builder.cc:10:
2023-06-19 14:48:07 - INFO - | ../git/src/base/values.h:367:3: note: declared here
2023-06-19 14:48:07 - INFO - | 367 | Value(const Value&) = delete;
2023-06-19 14:48:07 - INFO - | | ^~~~~Is there a solution which works for both?
Ross
Quoted 82 lines · Khem Raj via lists.yoctoproject.org
Signed-off-by Khem Raj <[email protected]>---
...Remove-redundant-move-in-return-stat.patch | 43 +++++++++++++++++++
meta-arm/recipes-devtools/gn/gn_git.bb | 1 +2 files changed, 44 insertions(+)create mode 100644
meta-arm/recipes-devtools/gn/gn/0001-desc_builder.cc-Remove-redundant-move-in-return-stat.patchmeta-arm/recipes-devtools/gn/gn/0001-desc_builder.cc-Remove-redundant-move-in-return-stat.patch new file +43
-0@@ -0,0 +1,43 @@ +From 45673f4f62eb063d6d5aa0ad68a6171936ad9347 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Tue, 24 Jan 2023 00:13:57 -0800 +Subject: [PATCH] desc_builder.cc: Remove redundant move in return statement + +Fixes build with gcc13 + +../git/src/gn/desc_builder.cc: In member function 'base::Value {anonymous}::BaseDescBuilder::ToBaseValue(const Scope*)': +../git/src/gn/desc_builder.cc:179:21: error: redundant move in return statement [-Werror=redundant-move] + 179 | return std::move(res); + | ~~~~~~~~~^~~~~ + +Upstream-Status: Submitted [https://gn-review.googlesource.com/c/gn/+/15000] +Signed-off-by: Khem Raj <[email protected]> +--- + src/gn/desc_builder.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/gn/desc_builder.cc b/src/gn/desc_builder.cc +index 444a5e02..3ef170c3 100644 +--- a/src/gn/desc_builder.cc ++++ b/src/gn/desc_builder.cc +@@ -167,7 +167,7 @@ class BaseDescBuilder { + base::ListValue res; + for (const auto& v : vector) + res.GetList().emplace_back(ToBaseValue(v)); +- return std::move(res); ++ return res; + } + + base::Value ToBaseValue(const Scope* scope) { +@@ -176,7 +176,7 @@ class BaseDescBuilder { + scope->GetCurrentScopeValues(&map); + for (const auto& v : map) + res.SetKey(v.first, ToBaseValue(v.second)); +- return std::move(res); ++ return res; + } + + base::Value ToBaseValue(const Value& val) { +-- +2.39.1 +meta-arm/recipes-devtools/gn/gn_git.bb +0
-0@@ -5,6 +5,7 @@ LICENSE = "BSD-3-Clause"
LIC_FILES_CHKSUM= "file://LICENSE;md5=0fca02217a5d49a14dfe2d11837bb34d"
SRC_URI= "git://gn.googlesource.com/gn;protocol=https;branch=main\+ file://0001-desc_builder.cc-Remove-redundant-move-in-return-stat.patch \ file://0001-Replace-lstat64-stat64-functions-on-linux.patch"SRCREV = "
4bd1a77e67958fb7f6739bd4542641646f264e5d" PV = "0+git${SRCPV}"Signature · 10 lines
2.41.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#4803): https://lists.yoctoproject.org/g/meta-arm/message/4803 Mute This Topic: https://lists.yoctoproject.org/mt/99576553/6875888 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-arm/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
Re: [meta-arm] [PATCH 2/2] gn: Fix build with gcc13
Quoted 2 lines · Ross Burton
This breaks the build with gcc12.2 though:
easiest is to use GCC_MAJOR macro to make it version specific
Quoted 108 lines
2023-06-19 14:48:07 - INFO - | ../git/src/gn/desc_builder.cc: In member function ‘base::Value {anonymous}::BaseDescBuilder::ToBaseValue(const Scope*)’: 2023-06-19 14:48:07 - INFO - | ../git/src/gn/desc_builder.cc:180:12: error: use of deleted function ‘base::Value::Value(const base::Value&)’ 2023-06-19 14:48:07 - INFO - | 180 | return res; 2023-06-19 14:48:07 - INFO - | | ^~~ 2023-06-19 14:48:07 - INFO - | In file included from ../git/src/gn/commands.h:14, 2023-06-19 14:48:07 - INFO - | from ../git/src/gn/desc_builder.cc:10: 2023-06-19 14:48:07 - INFO - | ../git/src/base/values.h:367:3: note: declared here 2023-06-19 14:48:07 - INFO - | 367 | Value(const Value&) = delete; 2023-06-19 14:48:07 - INFO - | | ^~~~~ 2023-06-19 14:48:07 - INFO - | ../git/src/gn/desc_builder.cc: In instantiation of ‘base::Value {anonymous}::BaseDescBuilder::ToBaseValue(const std::vector<T>&) [with T = Value]’: 2023-06-19 14:48:07 - INFO - | ../git/src/gn/desc_builder.cc:194:44: required from here 2023-06-19 14:48:07 - INFO - | ../git/src/gn/desc_builder.cc:171:12: error: use of deleted function ‘base::Value::Value(const base::Value&)’ 2023-06-19 14:48:07 - INFO - | 171 | return res; 2023-06-19 14:48:07 - INFO - | | ^~~ 2023-06-19 14:48:07 - INFO - | In file included from ../git/src/gn/commands.h:14, 2023-06-19 14:48:07 - INFO - | from ../git/src/gn/desc_builder.cc:10: 2023-06-19 14:48:07 - INFO - | ../git/src/base/values.h:367:3: note: declared here 2023-06-19 14:48:07 - INFO - | 367 | Value(const Value&) = delete; 2023-06-19 14:48:07 - INFO - | | ^~~~~Is there a solution which works for both?
Ross
Quoted 82 lines · Khem Raj via lists.yoctoproject.org
Signed-off-by Khem Raj <[email protected]>---
...Remove-redundant-move-in-return-stat.patch | 43 +++++++++++++++++++
meta-arm/recipes-devtools/gn/gn_git.bb | 1 +2 files changed, 44 insertions(+)create mode 100644
meta-arm/recipes-devtools/gn/gn/0001-desc_builder.cc-Remove-redundant-move-in-return-stat.patchmeta-arm/recipes-devtools/gn/gn/0001-desc_builder.cc-Remove-redundant-move-in-return-stat.patch new file +43
-0@@ -0,0 +1,43 @@ +From 45673f4f62eb063d6d5aa0ad68a6171936ad9347 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Tue, 24 Jan 2023 00:13:57 -0800 +Subject: [PATCH] desc_builder.cc: Remove redundant move in return statement + +Fixes build with gcc13 + +../git/src/gn/desc_builder.cc: In member function 'base::Value {anonymous}::BaseDescBuilder::ToBaseValue(const Scope*)': +../git/src/gn/desc_builder.cc:179:21: error: redundant move in return statement [-Werror=redundant-move] + 179 | return std::move(res); + | ~~~~~~~~~^~~~~ + +Upstream-Status: Submitted [https://gn-review.googlesource.com/c/gn/+/15000] +Signed-off-by: Khem Raj <[email protected]> +--- + src/gn/desc_builder.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/gn/desc_builder.cc b/src/gn/desc_builder.cc +index 444a5e02..3ef170c3 100644 +--- a/src/gn/desc_builder.cc ++++ b/src/gn/desc_builder.cc +@@ -167,7 +167,7 @@ class BaseDescBuilder { + base::ListValue res; + for (const auto& v : vector) + res.GetList().emplace_back(ToBaseValue(v)); +- return std::move(res); ++ return res; + } + + base::Value ToBaseValue(const Scope* scope) { +@@ -176,7 +176,7 @@ class BaseDescBuilder { + scope->GetCurrentScopeValues(&map); + for (const auto& v : map) + res.SetKey(v.first, ToBaseValue(v.second)); +- return std::move(res); ++ return res; + } + + base::Value ToBaseValue(const Value& val) { +-- +2.39.1 +meta-arm/recipes-devtools/gn/gn_git.bb +0
-0@@ -5,6 +5,7 @@ LICENSE = "BSD-3-Clause"
LIC_FILES_CHKSUM= "file://LICENSE;md5=0fca02217a5d49a14dfe2d11837bb34d"
SRC_URI= "git://gn.googlesource.com/gn;protocol=https;branch=main\+ file://0001-desc_builder.cc-Remove-redundant-move-in-return-stat.patch \ file://0001-Replace-lstat64-stat64-functions-on-linux.patch"SRCREV = "
4bd1a77e67958fb7f6739bd4542641646f264e5d" PV = "0+git${SRCPV}"
--
2.41.0-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#4803): https://lists.yoctoproject.org/g/meta-arm/message/4803
Mute This Topic: https://lists.yoctoproject.org/mt/99576553/6875888
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-arm/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Jon Mason
AppliedQuoted 1 line · Khem Raj
Brings fixes to build with gcc-13
Applied, thanks!
[1/2] gn: update to latest
commit: 856610082bb188deb81a9e685d251fcc37b2f644
[2/2] gn: Fix build with gcc13
commit: 770bef8dced4c79b8fa80c4a814a65c8ad080eecBest regards,
Signature · 1 line
Jon Mason <[email protected]>