Skip to content

Commit

Permalink
nodejs: Fix build with gcc13
Browse files Browse the repository at this point in the history
Source: meta-openembedded
MR: 126092
Type: Integration
Disposition: Merged from meta-openembedded
ChangeID: 4cc7363
Description:

Signed-off-by: Khem Raj <[email protected]>
Signed-off-by: Martin Jansa <[email protected]>
Signed-off-by: Armin Kuster <[email protected]>
Signed-off-by: Jeremy A. Puhlman <[email protected]>
  • Loading branch information
kraj authored and jpuhlman committed May 30, 2023
1 parent a3efd26 commit 5eae978
Show file tree
Hide file tree
Showing 2 changed files with 76 additions and 0 deletions.
75 changes: 75 additions & 0 deletions meta-oe/recipes-devtools/nodejs/nodejs/gcc13.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
From 576aed71db7b40c90b44c623580629792a606928 Mon Sep 17 00:00:00 2001
From: Jiawen Geng <[email protected]>
Date: Fri, 14 Oct 2022 09:54:33 +0800
Subject: [PATCH] deps: V8: cherry-pick c2792e58035f
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Original commit message:

[base] Fix build with gcc-13

See https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes.

Also see Gentoo Linux bug report: https://bugs.gentoo.org/865981

Change-Id: I421f396b02ba37e12ee70048ee33e034f8113566
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3934140
Reviewed-by: Clemens Backes <[email protected]>
Reviewed-by: Simon Zünd <[email protected]>
Commit-Queue: Clemens Backes <[email protected]>
Cr-Commit-Position: refs/heads/main@{#83587}

Refs: https://github.com/v8/v8/commit/c2792e58035fcbaa16d0cb70998852fbeb5df4cc
PR-URL: https://github.com/nodejs/node/pull/44961
Fixes: https://github.com/nodejs/node/issues/43642
Reviewed-By: Michaël Zasso <[email protected]>
Reviewed-By: Richard Lau <[email protected]>
Reviewed-By: Luigi Pinca <[email protected]>
Reviewed-By: Colin Ihrig <[email protected]>

Upstream-Status: Backport [https://github.com/nodejs/node/commit/0be1c5728173ea9ac42843058e26b6268568acf0]
Signed-off-by: Khem Raj <[email protected]>
---
deps/v8/AUTHORS | 1 +
deps/v8/src/base/logging.h | 1 +
deps/v8/src/inspector/v8-string-conversions.h | 1 +
3 files changed, 3 insertions(+)

diff --git a/deps/v8/AUTHORS b/deps/v8/AUTHORS
index 35c49a01..736d3df9 100644
--- a/deps/v8/AUTHORS
+++ b/deps/v8/AUTHORS
@@ -236,6 +236,7 @@ Vlad Burlik <[email protected]>
Vladimir Krivosheev <[email protected]>
Vladimir Shutoff <[email protected]>
Wael Almattar <[email protected]>
+WANG Xuerui <[email protected]>
Wei Wu <[email protected]>
Wenlu Wang <[email protected]>
Wenyu Zhao <[email protected]>
diff --git a/deps/v8/src/base/logging.h b/deps/v8/src/base/logging.h
index 08db24a9..38be165f 100644
--- a/deps/v8/src/base/logging.h
+++ b/deps/v8/src/base/logging.h
@@ -5,6 +5,7 @@
#ifndef V8_BASE_LOGGING_H_
#define V8_BASE_LOGGING_H_

+#include <cstdint>
#include <cstring>
#include <sstream>
#include <string>
diff --git a/deps/v8/src/inspector/v8-string-conversions.h b/deps/v8/src/inspector/v8-string-conversions.h
index c1d69c18..eb33c681 100644
--- a/deps/v8/src/inspector/v8-string-conversions.h
+++ b/deps/v8/src/inspector/v8-string-conversions.h
@@ -5,6 +5,7 @@
#ifndef V8_INSPECTOR_V8_STRING_CONVERSIONS_H_
#define V8_INSPECTOR_V8_STRING_CONVERSIONS_H_

+#include <cstdint>
#include <string>

// Conversion routines between UT8 and UTF16, used by string-16.{h,cc}. You may
1 change: 1 addition & 0 deletions meta-oe/recipes-devtools/nodejs/nodejs_16.19.1.bb
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \
file://0001-liftoff-Correct-function-signatures.patch \
file://0001-mips-Use-32bit-cast-for-operand-on-mips32.patch \
file://0001-Nodejs-Fixed-pipes-DeprecationWarning.patch \
file://gcc13.patch \
"
SRC_URI:append:class-target = " \
file://0001-Using-native-binaries.patch \
Expand Down

0 comments on commit 5eae978

Please sign in to comment.