summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2023-07-23 18:05:53 +0200
committerArmin Kuster <akuster808@gmail.com>2023-07-25 07:29:04 -0400
commit0aa6a3ddc607cca1bdf29c6ebb38cddcb5114e3e (patch)
tree95f458f83c67dc8e259f5bb5c8042038ba2c9efb
parent3c62000f88c7a81646f7dfe8a8d9ac145a8b9af5 (diff)
downloadmeta-openembedded-0aa6a3ddc607cca1bdf29c6ebb38cddcb5114e3e.tar.gz
nodejs: Fix build with gcc13
* MJ: remove AUTHORS modification from the original patch from nodejs-16, so that the same patch does apply for both 14 and 12 versions used in dunfell * MJ: gcc-13 isn't used for target builds in dunfell, but can be used on host, so this is useful backport for nodejs-native * MJ: this fixes default nodejs-native-12, nodejs-native-14 with negative D_P might need additional fix on top Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-oe/recipes-devtools/nodejs/nodejs/gcc13.patch63
-rw-r--r--meta-oe/recipes-devtools/nodejs/nodejs_12.22.12.bb1
-rw-r--r--meta-oe/recipes-devtools/nodejs/nodejs_14.18.1.bb1
3 files changed, 65 insertions, 0 deletions
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/gcc13.patch b/meta-oe/recipes-devtools/nodejs/nodejs/gcc13.patch
new file mode 100644
index 0000000000..dd21af6b3a
--- /dev/null
+++ b/meta-oe/recipes-devtools/nodejs/nodejs/gcc13.patch
@@ -0,0 +1,63 @@
1From 576aed71db7b40c90b44c623580629792a606928 Mon Sep 17 00:00:00 2001
2From: Jiawen Geng <technicalcute@gmail.com>
3Date: Fri, 14 Oct 2022 09:54:33 +0800
4Subject: [PATCH] deps: V8: cherry-pick c2792e58035f
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9Original commit message:
10
11 [base] Fix build with gcc-13
12
13 See https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes.
14
15 Also see Gentoo Linux bug report: https://bugs.gentoo.org/865981
16
17 Change-Id: I421f396b02ba37e12ee70048ee33e034f8113566
18 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3934140
19 Reviewed-by: Clemens Backes <clemensb@chromium.org>
20 Reviewed-by: Simon Zund <szuend@chromium.org>
21 Commit-Queue: Clemens Backes <clemensb@chromium.org>
22 Cr-Commit-Position: refs/heads/main@{#83587}
23
24Refs: https://github.com/v8/v8/commit/c2792e58035fcbaa16d0cb70998852fbeb5df4cc
25PR-URL: https://github.com/nodejs/node/pull/44961
26Fixes: https://github.com/nodejs/node/issues/43642
27Reviewed-By: Michael Zasso <targos@protonmail.com>
28Reviewed-By: Richard Lau <rlau@redhat.com>
29Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
30Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
31
32Upstream-Status: Backport [https://github.com/nodejs/node/commit/0be1c5728173ea9ac42843058e26b6268568acf0]
33Signed-off-by: Khem Raj <raj.khem@gmail.com>
34---
35 deps/v8/AUTHORS | 1 +
36 deps/v8/src/base/logging.h | 1 +
37 deps/v8/src/inspector/v8-string-conversions.h | 1 +
38 3 files changed, 3 insertions(+)
39
40diff --git a/deps/v8/src/base/logging.h b/deps/v8/src/base/logging.h
41index 08db24a9..38be165f 100644
42--- a/deps/v8/src/base/logging.h
43+++ b/deps/v8/src/base/logging.h
44@@ -5,6 +5,7 @@
45 #ifndef V8_BASE_LOGGING_H_
46 #define V8_BASE_LOGGING_H_
47
48+#include <cstdint>
49 #include <cstring>
50 #include <sstream>
51 #include <string>
52diff --git a/deps/v8/src/inspector/v8-string-conversions.h b/deps/v8/src/inspector/v8-string-conversions.h
53index c1d69c18..eb33c681 100644
54--- a/deps/v8/src/inspector/v8-string-conversions.h
55+++ b/deps/v8/src/inspector/v8-string-conversions.h
56@@ -5,6 +5,7 @@
57 #ifndef V8_INSPECTOR_V8_STRING_CONVERSIONS_H_
58 #define V8_INSPECTOR_V8_STRING_CONVERSIONS_H_
59
60+#include <cstdint>
61 #include <string>
62
63 // Conversion routines between UT8 and UTF16, used by string-16.{h,cc}. You may
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_12.22.12.bb b/meta-oe/recipes-devtools/nodejs/nodejs_12.22.12.bb
index c1d66eeffb..facc399085 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs_12.22.12.bb
+++ b/meta-oe/recipes-devtools/nodejs/nodejs_12.22.12.bb
@@ -27,6 +27,7 @@ SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \
27 file://CVE-2022-43548.patch \ 27 file://CVE-2022-43548.patch \
28 file://CVE-llhttp.patch \ 28 file://CVE-llhttp.patch \
29 file://python-3.11-invalid-mode-rU.patch \ 29 file://python-3.11-invalid-mode-rU.patch \
30 file://gcc13.patch \
30 " 31 "
31SRC_URI_append_class-target = " \ 32SRC_URI_append_class-target = " \
32 file://0002-Using-native-binaries.patch \ 33 file://0002-Using-native-binaries.patch \
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_14.18.1.bb b/meta-oe/recipes-devtools/nodejs/nodejs_14.18.1.bb
index fc886817ac..882d3f6573 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs_14.18.1.bb
+++ b/meta-oe/recipes-devtools/nodejs/nodejs_14.18.1.bb
@@ -29,6 +29,7 @@ SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \
29 file://CVE-2022-32212.patch \ 29 file://CVE-2022-32212.patch \
30 file://CVE-2022-35255.patch \ 30 file://CVE-2022-35255.patch \
31 file://CVE-2022-43548.patch \ 31 file://CVE-2022-43548.patch \
32 file://gcc13.patch \
32 " 33 "
33SRC_URI:append:class-target = " \ 34SRC_URI:append:class-target = " \
34 file://0002-Using-native-binaries-nodejs14.patch \ 35 file://0002-Using-native-binaries-nodejs14.patch \