diff mbox series

[meta-oe,12/12] nodejs: Fix build with gcc13

Message ID 20230130050909.133727-12-raj.khem@gmail.com
State New
Headers show
Series [meta-networking,01/12] wireshark: Add nghttp2 packageconfig | expand

Commit Message

Khem Raj Jan. 30, 2023, 5:09 a.m. UTC 
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../nodejs/nodejs/gcc13.patch                 | 28 +++++++++++++++++++
 .../recipes-devtools/nodejs/nodejs_18.12.1.bb |  1 +
 2 files changed, 29 insertions(+)
 create mode 100644 meta-oe/recipes-devtools/nodejs/nodejs/gcc13.patch

Comments

Martin Jansa Feb. 1, 2023, 11:14 a.m. UTC | #1 
On Mon, Jan 30, 2023 at 6:09 AM Khem Raj <raj.khem@gmail.com> wrote:

> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  .../nodejs/nodejs/gcc13.patch                 | 28 +++++++++++++++++++
>  .../recipes-devtools/nodejs/nodejs_18.12.1.bb |  1 +
>  2 files changed, 29 insertions(+)
>  create mode 100644 meta-oe/recipes-devtools/nodejs/nodejs/gcc13.patch
>
> 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..7268c5e64f
> --- /dev/null
> +++ b/meta-oe/recipes-devtools/nodejs/nodejs/gcc13.patch
> @@ -0,0 +1,28 @@
> +Add missing <cstdint>
> +
> +gcc 13 moved some includes around and as a result <cstdint> is no longer
> transitively included [1]. Explicitly include it for uint{32,64}_t.
> +
> +[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes
> +
> +Signed-off-by: Khem Raj <raj.khem@gmail.com>
>

You can add:
Upstream-Status: Backport [
https://github.com/nodejs/node/commit/0be1c5728173ea9ac42843058e26b6268568acf0
]


> +
> +--- 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>
> +--- 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
> diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb
> b/meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb
> index e96913e563..e96412fecc 100644
> --- a/meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb
> +++ b/meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb
> @@ -25,6 +25,7 @@ SRC_URI = "
> http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \
>             file://system-c-ares.patch \
>             file://0001-liftoff-Correct-function-signatures.patch \
>             file://0001-mips-Use-32bit-cast-for-operand-on-mips32.patch \
> +           file://gcc13.patch \
>             "
>
>  SRC_URI:append:class-target = " \
> --
> 2.39.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#100856):
> https://lists.openembedded.org/g/openembedded-devel/message/100856
> Mute This Topic: https://lists.openembedded.org/mt/96622215/3617156
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [
> Martin.Jansa@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>
Khem Raj Feb. 1, 2023, 5:09 p.m. UTC | #2 
On Wed, Feb 1, 2023 at 3:14 AM Martin Jansa <martin.jansa@gmail.com> wrote:
>
> On Mon, Jan 30, 2023 at 6:09 AM Khem Raj <raj.khem@gmail.com> wrote:
>>
>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> ---
>>  .../nodejs/nodejs/gcc13.patch                 | 28 +++++++++++++++++++
>>  .../recipes-devtools/nodejs/nodejs_18.12.1.bb |  1 +
>>  2 files changed, 29 insertions(+)
>>  create mode 100644 meta-oe/recipes-devtools/nodejs/nodejs/gcc13.patch
>>
>> 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..7268c5e64f
>> --- /dev/null
>> +++ b/meta-oe/recipes-devtools/nodejs/nodejs/gcc13.patch
>> @@ -0,0 +1,28 @@
>> +Add missing <cstdint>
>> +
>> +gcc 13 moved some includes around and as a result <cstdint> is no longer transitively included [1]. Explicitly include it for uint{32,64}_t.
>> +
>> +[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes
>> +
>> +Signed-off-by: Khem Raj <raj.khem@gmail.com>
>
>
> You can add:
> Upstream-Status: Backport [https://github.com/nodejs/node/commit/0be1c5728173ea9ac42843058e26b6268568acf0]
>

Thanks for reviewing and providing this info. I have taken the
original patch and replaced mine.

>>
>> +
>> +--- 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>
>> +--- 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
>> diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb b/meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb
>> index e96913e563..e96412fecc 100644
>> --- a/meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb
>> +++ b/meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb
>> @@ -25,6 +25,7 @@ SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \
>>             file://system-c-ares.patch \
>>             file://0001-liftoff-Correct-function-signatures.patch \
>>             file://0001-mips-Use-32bit-cast-for-operand-on-mips32.patch \
>> +           file://gcc13.patch \
>>             "
>>
>>  SRC_URI:append:class-target = " \
>> --
>> 2.39.1
>>
>>
>> -=-=-=-=-=-=-=-=-=-=-=-
>> Links: You receive all messages sent to this group.
>> View/Reply Online (#100856): https://lists.openembedded.org/g/openembedded-devel/message/100856
>> Mute This Topic: https://lists.openembedded.org/mt/96622215/3617156
>> Group Owner: openembedded-devel+owner@lists.openembedded.org
>> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [Martin.Jansa@gmail.com]
>> -=-=-=-=-=-=-=-=-=-=-=-
>>
diff mbox series

Patch

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..7268c5e64f
--- /dev/null
+++ b/meta-oe/recipes-devtools/nodejs/nodejs/gcc13.patch
@@ -0,0 +1,28 @@ 
+Add missing <cstdint>
+
+gcc 13 moved some includes around and as a result <cstdint> is no longer transitively included [1]. Explicitly include it for uint{32,64}_t.
+
+[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+--- 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>
+--- 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
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb b/meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb
index e96913e563..e96412fecc 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb
+++ b/meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb
@@ -25,6 +25,7 @@  SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \
            file://system-c-ares.patch \
            file://0001-liftoff-Correct-function-signatures.patch \
            file://0001-mips-Use-32bit-cast-for-operand-on-mips32.patch \
+           file://gcc13.patch \
            "
 
 SRC_URI:append:class-target = " \