[Buildroot] [git commit] package/nodejs: improve 0001-add-qemu-wrapper-support.patch to fix build issue

[Buildroot] [git commit] package/nodejs: improve 0001-add-qemu-wrapper-support.patch to fix build issue

[Thomas Petazzoni]

commit: https://git.buildroot.net/buildroot/commit/?id=cf0ddc89705af989393b1601bbf57d567a9a1b13
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master

Since upstream commit 79da2534737bd090b7000beed68d225618606e53,
present since NodeJS 16.0.0, another call to the torque tool is done
in tools/v8_gypfiles/v8.gyp, but our patch to wrap calls to such tools
under Qemu forgot this addition. Due to this, the build of NodeJS is
broken since the bump to v16 in Buildroot commit
07408779cc068041a2da6838fe077d1a679f1736 ("package/nodejs: bump to
16.15.0"). This issue is not visible in the autobuilders as it was
hidden by a previous build issue, itself fixed by "package/nodejs: fix
'Duplicate v8 target errors when cross-compiling' error".

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
 package/nodejs/0001-add-qemu-wrapper-support.patch | 37 ++++++++++++++--------
 1 file changed, 23 insertions(+), 14 deletions(-)

diff --git a/package/nodejs/0001-add-qemu-wrapper-support.patch b/package/nodejs/0001-add-qemu-wrapper-support.patch
index 1368ca5a38..8d09601158 100644
--- a/package/nodejs/0001-add-qemu-wrapper-support.patch
+++ b/package/nodejs/0001-add-qemu-wrapper-support.patch
@@ -1,4 +1,4 @@
-From fa09fa3ad6a21ae0b35fb860f76d1762e5f29972 Mon Sep 17 00:00:00 2001
+From c6103ceab64b73c1a25ece3315ea8f52507c2bfe Mon Sep 17 00:00:00 2001
 From: Adam Duskett <aduskett@gmail.com>
 Date: Mon, 27 Sep 2021 12:55:09 -0700
 Subject: [PATCH] add qemu-wrapper support
@@ -17,15 +17,15 @@ host-builds.
 
 Signed-off-by: Adam Duskett <aduskett@gmail.com>
 ---
- node.gyp                 | 4 ++--
- tools/v8_gypfiles/v8.gyp | 8 ++++----
- 2 files changed, 6 insertions(+), 6 deletions(-)
+ node.gyp                 |  4 ++--
+ tools/v8_gypfiles/v8.gyp | 10 +++++-----
+ 2 files changed, 7 insertions(+), 7 deletions(-)
 
 diff --git a/node.gyp b/node.gyp
-index 8ba0dfeb..c77f6f7d 100644
+index 74e9f9cc2e..c3eaab6c92 100644
 --- a/node.gyp
 +++ b/node.gyp
-@@ -491,7 +491,7 @@
+@@ -295,7 +295,7 @@
                'action_name': 'run_mkcodecache',
                'process_outputs_as_sources': 1,
                'inputs': [
@@ -34,7 +34,7 @@ index 8ba0dfeb..c77f6f7d 100644
                ],
                'outputs': [
                  '<(SHARED_INTERMEDIATE_DIR)/node_code_cache.cc',
-@@ -516,7 +516,7 @@
+@@ -320,7 +320,7 @@
                'action_name': 'node_mksnapshot',
                'process_outputs_as_sources': 1,
                'inputs': [
@@ -44,10 +44,10 @@ index 8ba0dfeb..c77f6f7d 100644
                'outputs': [
                  '<(SHARED_INTERMEDIATE_DIR)/node_snapshot.cc',
 diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp
-index 48ec392b..f9bb0fbe 100644
+index 39b96803c7..9321982ea4 100644
 --- a/tools/v8_gypfiles/v8.gyp
 +++ b/tools/v8_gypfiles/v8.gyp
-@@ -220,7 +220,7 @@
+@@ -68,7 +68,7 @@
          {
            'action_name': 'run_torque_action',
            'inputs': [  # Order matters.
@@ -56,7 +56,16 @@ index 48ec392b..f9bb0fbe 100644
              '<@(torque_files)',
            ],
            'outputs': [
-@@ -351,7 +351,7 @@
+@@ -99,7 +99,7 @@
+             '<@(torque_outputs_inc)',
+           ],
+           'action': [
+-            '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)torque<(EXECUTABLE_SUFFIX)',
++            @MAYBE_WRAPPER@ '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)torque<(EXECUTABLE_SUFFIX)',
+             '-o', '<(SHARED_INTERMEDIATE_DIR)/torque-generated',
+             '-v8-root', '<(V8_ROOT)',
+             '<@(torque_files_without_v8_root)',
+@@ -211,7 +211,7 @@
          {
            'action_name': 'generate_bytecode_builtins_list_action',
            'inputs': [
@@ -65,7 +74,7 @@ index 48ec392b..f9bb0fbe 100644
            ],
            'outputs': [
              '<(generate_bytecode_builtins_list_output)',
-@@ -533,7 +533,7 @@
+@@ -395,7 +395,7 @@
              ],
            },
            'inputs': [
@@ -74,7 +83,7 @@ index 48ec392b..f9bb0fbe 100644
            ],
            'outputs': [
              '<(INTERMEDIATE_DIR)/snapshot.cc',
-@@ -1448,7 +1448,7 @@
+@@ -1503,7 +1503,7 @@
          {
            'action_name': 'run_gen-regexp-special-case_action',
            'inputs': [
@@ -83,6 +92,6 @@ index 48ec392b..f9bb0fbe 100644
            ],
            'outputs': [
              '<(SHARED_INTERMEDIATE_DIR)/src/regexp/special-case.cc',
---
-2.31.1
+-- 
+2.37.3
 
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [git commit] package/nodejs: improve 0001-add-qemu-wrapper-support.patch to fix build issue

[Peter Korsgaard]

>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@bootlin.com> writes:

 > commit: https://git.buildroot.net/buildroot/commit/?id=cf0ddc89705af989393b1601bbf57d567a9a1b13
 > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master

 > Since upstream commit 79da2534737bd090b7000beed68d225618606e53,
 > present since NodeJS 16.0.0, another call to the torque tool is done
 > in tools/v8_gypfiles/v8.gyp, but our patch to wrap calls to such tools
 > under Qemu forgot this addition. Due to this, the build of NodeJS is
 > broken since the bump to v16 in Buildroot commit
 > 07408779cc068041a2da6838fe077d1a679f1736 ("package/nodejs: bump to
 > 16.15.0"). This issue is not visible in the autobuilders as it was
 > hidden by a previous build issue, itself fixed by "package/nodejs: fix
 > 'Duplicate v8 target errors when cross-compiling' error".

 > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

Committed to 2022.08.x, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot