* [PATCH] gn: Fix build with gcc13
@ 2023-02-05 17:58 Khem Raj
2023-02-15 13:18 ` Jon Mason
0 siblings, 1 reply; 2+ messages in thread
From: Khem Raj @ 2023-02-05 17:58 UTC (permalink / raw)
To: meta-arm; +Cc: Khem Raj
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
...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
diff --git a/meta-arm/recipes-devtools/gn/gn/0001-desc_builder.cc-Remove-redundant-move-in-return-stat.patch b/meta-arm/recipes-devtools/gn/gn/0001-desc_builder.cc-Remove-redundant-move-in-return-stat.patch
new file mode 100644
index 00000000..f712037a
--- /dev/null
+++ b/meta-arm/recipes-devtools/gn/gn/0001-desc_builder.cc-Remove-redundant-move-in-return-stat.patch
@@ -0,0 +1,43 @@
+From 45673f4f62eb063d6d5aa0ad68a6171936ad9347 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+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 <raj.khem@gmail.com>
+---
+ 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
+
diff --git a/meta-arm/recipes-devtools/gn/gn_git.bb b/meta-arm/recipes-devtools/gn/gn_git.bb
index 521e33e9..2e58d28b 100644
--- a/meta-arm/recipes-devtools/gn/gn_git.bb
+++ b/meta-arm/recipes-devtools/gn/gn_git.bb
@@ -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 = "bf4e17dc67b2a2007475415e3f9e1d1cf32f6e35"
PV = "0+git${SRCPV}"
--
2.39.1
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] gn: Fix build with gcc13
2023-02-05 17:58 [PATCH] gn: Fix build with gcc13 Khem Raj
@ 2023-02-15 13:18 ` Jon Mason
0 siblings, 0 replies; 2+ messages in thread
From: Jon Mason @ 2023-02-15 13:18 UTC (permalink / raw)
To: Khem Raj; +Cc: meta-arm
On Sun, Feb 05, 2023 at 09:58:58AM -0800, Khem Raj wrote:
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
For tc1, I'm seeing the following error:
| FAILED: src/gn/desc_builder.o
| g++
| ../git/src/gn/desc_builder.cc: In member function ‘base::Value {anonymous}::BaseDescBuilder::ToBaseValue(const Scope*)’:
| ../git/src/gn/desc_builder.cc:179:12: error: use of deleted function ‘base::Value::Value(const base::Value&)’
| 179 | return res;
| | ^~~
| In file included from ../git/src/gn/commands.h:14,
| from ../git/src/gn/desc_builder.cc:10:
| ../git/src/base/values.h:367:3: note: declared here
| 367 | Value(const Value&) = delete;
| | ^~~~~
| ../git/src/gn/desc_builder.cc: In instantiation of ‘base::Value {anonymous}::BaseDescBuilder::ToBaseValue(const std::vector<T>&) [with T = Value]’:
| ../git/src/gn/desc_builder.cc:193:44: required from here
| ../git/src/gn/desc_builder.cc:170:12: error: use of deleted function ‘base::Value::Value(const base::Value&)’
| 170 | return res;
| | ^~~
| In file included from ../git/src/gn/commands.h:14,
| from ../git/src/gn/desc_builder.cc:10:
| ../git/src/base/values.h:367:3: note: declared here
| 367 | Value(const Value&) = delete;
| | ^~~~~
See
https://gitlab.com/jonmason00/meta-arm/-/jobs/3770086697
Thanks,
Jon
> ---
> ...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
>
> diff --git a/meta-arm/recipes-devtools/gn/gn/0001-desc_builder.cc-Remove-redundant-move-in-return-stat.patch b/meta-arm/recipes-devtools/gn/gn/0001-desc_builder.cc-Remove-redundant-move-in-return-stat.patch
> new file mode 100644
> index 00000000..f712037a
> --- /dev/null
> +++ b/meta-arm/recipes-devtools/gn/gn/0001-desc_builder.cc-Remove-redundant-move-in-return-stat.patch
> @@ -0,0 +1,43 @@
> +From 45673f4f62eb063d6d5aa0ad68a6171936ad9347 Mon Sep 17 00:00:00 2001
> +From: Khem Raj <raj.khem@gmail.com>
> +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 <raj.khem@gmail.com>
> +---
> + 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
> +
> diff --git a/meta-arm/recipes-devtools/gn/gn_git.bb b/meta-arm/recipes-devtools/gn/gn_git.bb
> index 521e33e9..2e58d28b 100644
> --- a/meta-arm/recipes-devtools/gn/gn_git.bb
> +++ b/meta-arm/recipes-devtools/gn/gn_git.bb
> @@ -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 = "bf4e17dc67b2a2007475415e3f9e1d1cf32f6e35"
> PV = "0+git${SRCPV}"
> --
> 2.39.1
>
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-02-15 13:18 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-02-05 17:58 [PATCH] gn: Fix build with gcc13 Khem Raj
2023-02-15 13:18 ` Jon Mason
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).