forked from NixOS/nixpkgs
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
nodejs: fix cross compilation for armv7l
The v8 library supports only limited number of build platforms based on the host architecture. The rule there is the bitness (the mixing of 32bit and 64bit architectures seems to be in most cases disallowed). Thus this adds usage of the emulator of the host platform and builds tools for that. This also allows us to use ninja instead of make when build ≠ host while waiting for nodejs/gyp-next#185 to be merged. Co-authored-by: Ivan Trubach <[email protected]>
- Loading branch information
Showing
6 changed files
with
339 additions
and
48 deletions.
There are no files selected for viewing
131 changes: 131 additions & 0 deletions
131
pkgs/development/web/nodejs/configure-emulator-node18.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,131 @@ | ||
| From eaf2e55c472ce1b71e74d9d30b287be74a2e2b7a Mon Sep 17 00:00:00 2001 | ||
| From: Ivan Trubach <[email protected]> | ||
| Date: Mon, 15 Jul 2024 11:43:43 +0300 | ||
| Subject: [PATCH] tools: support setting an emulator from configure script | ||
| MIME-Version: 1.0 | ||
| Content-Type: text/plain; charset=UTF-8 | ||
| Content-Transfer-Encoding: 8bit | ||
|
|
||
| V8’s JIT infrastructure requires binaries such as mksnapshot to be run | ||
| during the build. However, these binaries must have the same bit-width | ||
| as the host platform (e.g. a x86_64 build platform targeting ARMv6 needs | ||
| to produce a 32-bit binary). | ||
|
|
||
| To work around this issue, build the binaries for the host platform and | ||
| run them on the host with an emulator (if set from configure.py). | ||
|
|
||
| Based on Buildroot’s nodejs-src 0001-add-qemu-wrapper-support.patch. | ||
| https://gitlab.com/buildroot.org/buildroot/-/raw/c1d5eada4d4db9eeaa1c44dd1dea95a67c8a70ca/package/nodejs/nodejs-src/0001-add-qemu-wrapper-support.patch | ||
| --- | ||
| common.gypi | 1 + | ||
| configure.py | 9 +++++++++ | ||
| node.gyp | 3 +++ | ||
| tools/v8_gypfiles/v8.gyp | 4 ++++ | ||
| 4 files changed, 17 insertions(+) | ||
|
|
||
| diff --git a/common.gypi b/common.gypi | ||
| index ec92c9df4c..6474495ab6 100644 | ||
| --- a/common.gypi | ||
| +++ b/common.gypi | ||
| @@ -13,6 +13,7 @@ | ||
| 'enable_pgo_generate%': '0', | ||
| 'enable_pgo_use%': '0', | ||
| 'python%': 'python', | ||
| + 'emulator%': [], | ||
|
|
||
| 'node_shared%': 'false', | ||
| 'force_dynamic_crt%': 0, | ||
| diff --git a/configure.py b/configure.py | ||
| index 82916748fd..f1d332eefc 100755 | ||
| --- a/configure.py | ||
| +++ b/configure.py | ||
| @@ -112,6 +112,12 @@ parser.add_argument('--dest-cpu', | ||
| choices=valid_arch, | ||
| help=f"CPU architecture to build for ({', '.join(valid_arch)})") | ||
|
|
||
| +parser.add_argument('--emulator', | ||
| + action='store', | ||
| + dest='emulator', | ||
| + default=None, | ||
| + help='use an emulator to run intermediate build tools') | ||
| + | ||
| parser.add_argument('--cross-compiling', | ||
| action='store_true', | ||
| dest='cross_compiling', | ||
| @@ -2167,6 +2173,9 @@ elif flavor == 'win' and sys.platform != 'msys': | ||
| else: | ||
| gyp_args += ['-f', 'make-' + flavor] | ||
|
|
||
| +if options.emulator is not None: | ||
| + gyp_args += ['-Demulator=' + options.emulator] | ||
| + | ||
| if options.compile_commands_json: | ||
| gyp_args += ['-f', 'compile_commands_json'] | ||
| os.path.islink('./compile_commands.json') and os.unlink('./compile_commands.json') | ||
| diff --git a/node.gyp b/node.gyp | ||
| index 08cb3f38e8..515b305933 100644 | ||
| --- a/node.gyp | ||
| +++ b/node.gyp | ||
| @@ -332,6 +332,7 @@ | ||
| '<(SHARED_INTERMEDIATE_DIR)/node_snapshot.cc', | ||
| ], | ||
| 'action': [ | ||
| + '<@(emulator)', | ||
| '<(node_mksnapshot_exec)', | ||
| '--build-snapshot', | ||
| '<(node_snapshot_main)', | ||
| @@ -351,6 +352,7 @@ | ||
| '<(SHARED_INTERMEDIATE_DIR)/node_snapshot.cc', | ||
| ], | ||
| 'action': [ | ||
| + '<@(emulator)', | ||
| '<@(_inputs)', | ||
| '<@(_outputs)', | ||
| ], | ||
| @@ -1520,6 +1522,7 @@ | ||
| '<(PRODUCT_DIR)/<(node_core_target_name).def', | ||
| ], | ||
| 'action': [ | ||
| + '<@(emulator)', | ||
| '<(PRODUCT_DIR)/gen_node_def.exe', | ||
| '<@(_inputs)', | ||
| '<@(_outputs)', | ||
| diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp | ||
| index ba8b161f0f..d5c90dad50 100644 | ||
| --- a/tools/v8_gypfiles/v8.gyp | ||
| +++ b/tools/v8_gypfiles/v8.gyp | ||
| @@ -99,6 +99,7 @@ | ||
| '<@(torque_outputs_inc)', | ||
| ], | ||
| 'action': [ | ||
| + '<@(emulator)', | ||
| '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)torque<(EXECUTABLE_SUFFIX)', | ||
| '-o', '<(SHARED_INTERMEDIATE_DIR)/torque-generated', | ||
| '-v8-root', '<(V8_ROOT)', | ||
| @@ -219,6 +220,7 @@ | ||
| 'action': [ | ||
| '<(python)', | ||
| '<(V8_ROOT)/tools/run.py', | ||
| + '<@(emulator)', | ||
| '<@(_inputs)', | ||
| '<@(_outputs)', | ||
| ], | ||
| @@ -442,6 +444,7 @@ | ||
| }], | ||
| ], | ||
| 'action': [ | ||
| + '<@(emulator)', | ||
| '>@(_inputs)', | ||
| '>@(mksnapshot_flags)', | ||
| ], | ||
| @@ -1577,6 +1580,7 @@ | ||
| 'action': [ | ||
| '<(python)', | ||
| '<(V8_ROOT)/tools/run.py', | ||
| + '<@(emulator)', | ||
| '<@(_inputs)', | ||
| '<@(_outputs)', | ||
| ], | ||
| -- | ||
| 2.44.1 | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,139 @@ | ||
| From 438e3a08bf76bc0a9a098c16847e9029e20e240f Mon Sep 17 00:00:00 2001 | ||
| From: Ivan Trubach <[email protected]> | ||
| Date: Mon, 15 Jul 2024 11:43:43 +0300 | ||
| Subject: [PATCH] tools: support setting an emulator from configure script | ||
| MIME-Version: 1.0 | ||
| Content-Type: text/plain; charset=UTF-8 | ||
| Content-Transfer-Encoding: 8bit | ||
|
|
||
| V8’s JIT infrastructure requires binaries such as mksnapshot to be run | ||
| during the build. However, these binaries must have the same bit-width | ||
| as the host platform (e.g. a x86_64 build platform targeting ARMv6 needs | ||
| to produce a 32-bit binary). | ||
|
|
||
| To work around this issue, build the binaries for the host platform and | ||
| run them on the host with an emulator (if set from configure.py). | ||
|
|
||
| Based on Buildroot’s nodejs-src 0001-add-qemu-wrapper-support.patch. | ||
| https://gitlab.com/buildroot.org/buildroot/-/raw/c1d5eada4d4db9eeaa1c44dd1dea95a67c8a70ca/package/nodejs/nodejs-src/0001-add-qemu-wrapper-support.patch | ||
| --- | ||
| common.gypi | 1 + | ||
| configure.py | 9 +++++++++ | ||
| node.gyp | 4 ++++ | ||
| tools/v8_gypfiles/v8.gyp | 4 ++++ | ||
| 4 files changed, 18 insertions(+) | ||
|
|
||
| diff --git a/common.gypi b/common.gypi | ||
| index 3e1902fb78..e4940448ac 100644 | ||
| --- a/common.gypi | ||
| +++ b/common.gypi | ||
| @@ -13,6 +13,7 @@ | ||
| 'enable_pgo_generate%': '0', | ||
| 'enable_pgo_use%': '0', | ||
| 'python%': 'python', | ||
| + 'emulator%': [], | ||
|
|
||
| 'node_shared%': 'false', | ||
| 'force_dynamic_crt%': 0, | ||
| diff --git a/configure.py b/configure.py | ||
| index ee08264e91..02160ba1fa 100755 | ||
| --- a/configure.py | ||
| +++ b/configure.py | ||
| @@ -112,6 +112,12 @@ parser.add_argument('--dest-cpu', | ||
| choices=valid_arch, | ||
| help=f"CPU architecture to build for ({', '.join(valid_arch)})") | ||
|
|
||
| +parser.add_argument('--emulator', | ||
| + action='store', | ||
| + dest='emulator', | ||
| + default=None, | ||
| + help='use an emulator to run intermediate build tools') | ||
| + | ||
| parser.add_argument('--cross-compiling', | ||
| action='store_true', | ||
| dest='cross_compiling', | ||
| @@ -2114,6 +2120,9 @@ elif flavor == 'win' and sys.platform != 'msys': | ||
| else: | ||
| gyp_args += ['-f', 'make-' + flavor] | ||
|
|
||
| +if options.emulator is not None: | ||
| + gyp_args += ['-Demulator=' + options.emulator] | ||
| + | ||
| if options.compile_commands_json: | ||
| gyp_args += ['-f', 'compile_commands_json'] | ||
|
|
||
| diff --git a/node.gyp b/node.gyp | ||
| index cf016ef468..880449d9bb 100644 | ||
| --- a/node.gyp | ||
| +++ b/node.gyp | ||
| @@ -643,6 +643,7 @@ | ||
| '<(SHARED_INTERMEDIATE_DIR)/node_snapshot.cc', | ||
| ], | ||
| 'action': [ | ||
| + '<@(emulator)', | ||
| '<(node_mksnapshot_exec)', | ||
| '--build-snapshot', | ||
| '<(node_snapshot_main)', | ||
| @@ -662,6 +663,7 @@ | ||
| '<(SHARED_INTERMEDIATE_DIR)/node_snapshot.cc', | ||
| ], | ||
| 'action': [ | ||
| + '<@(emulator)', | ||
| '<@(_inputs)', | ||
| '<@(_outputs)', | ||
| ], | ||
| @@ -952,6 +954,7 @@ | ||
| '<(SHARED_INTERMEDIATE_DIR)/node_javascript.cc', | ||
| ], | ||
| 'action': [ | ||
| + '<@(emulator)', | ||
| '<(node_js2c_exec)', | ||
| '<@(_outputs)', | ||
| 'lib', | ||
| @@ -1340,6 +1343,7 @@ | ||
| '<(PRODUCT_DIR)/<(node_core_target_name).def', | ||
| ], | ||
| 'action': [ | ||
| + '<@(emulator)', | ||
| '<(PRODUCT_DIR)/gen_node_def.exe', | ||
| '<@(_inputs)', | ||
| '<@(_outputs)', | ||
| diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp | ||
| index f822c056e5..b7a629c54b 100644 | ||
| --- a/tools/v8_gypfiles/v8.gyp | ||
| +++ b/tools/v8_gypfiles/v8.gyp | ||
| @@ -112,6 +112,7 @@ | ||
| '<@(torque_outputs_inc)', | ||
| ], | ||
| 'action': [ | ||
| + '<@(emulator)', | ||
| '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)torque<(EXECUTABLE_SUFFIX)', | ||
| '-o', '<(SHARED_INTERMEDIATE_DIR)/torque-generated', | ||
| '-v8-root', '<(V8_ROOT)', | ||
| @@ -232,6 +233,7 @@ | ||
| 'action': [ | ||
| '<(python)', | ||
| '<(V8_ROOT)/tools/run.py', | ||
| + '<@(emulator)', | ||
| '<@(_inputs)', | ||
| '<@(_outputs)', | ||
| ], | ||
| @@ -443,6 +445,7 @@ | ||
| }], | ||
| ], | ||
| 'action': [ | ||
| + '<@(emulator)', | ||
| '>@(_inputs)', | ||
| '>@(mksnapshot_flags)', | ||
| ], | ||
| @@ -1668,6 +1671,7 @@ | ||
| 'action': [ | ||
| '<(python)', | ||
| '<(V8_ROOT)/tools/run.py', | ||
| + '<@(emulator)', | ||
| '<@(_inputs)', | ||
| '<@(_outputs)', | ||
| ], | ||
| -- | ||
| 2.44.1 | ||
|
|
Oops, something went wrong.