nodejs: use ninja for build #327653
+518
−87
There are no files selected for viewing
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
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,15 @@ | ||
| Allows ARM FPU to be set to vfpv2, e.g. for Raspberry Pi. | ||
|
|
||
| See https://github.com/nodejs/node/issues/44357#issuecomment-1235821878 | ||
|
|
||
| --- a/configure.py | ||
| +++ b/configure.py | ||
| @@ -50,7 +50,7 @@ | ||
| valid_arch = ('arm', 'arm64', 'ia32', 'mips', 'mipsel', 'mips64el', 'ppc', | ||
| 'ppc64', 'x64', 'x86', 'x86_64', 's390x', 'riscv64', 'loong64') | ||
| valid_arm_float_abi = ('soft', 'softfp', 'hard') | ||
| -valid_arm_fpu = ('vfp', 'vfpv3', 'vfpv3-d16', 'neon') | ||
| +valid_arm_fpu = ('vfp', 'vfpv2', 'vfpv3', 'vfpv3-d16', 'neon') | ||
| valid_mips_arch = ('loongson', 'r1', 'r2', 'r6', 'rx') | ||
| valid_mips_fpu = ('fp32', 'fp64', 'fpxx') | ||
| valid_mips_float_abi = ('soft', 'hard') |
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,138 @@ | ||
| From 4b83f714c821d6d4d2306673ee3a87907cfec80e Mon Sep 17 00:00:00 2001 | ||
| From: Ivan Trubach <mr.trubach@icloud.com> | ||
| Date: Fri, 19 Jul 2024 10:45:13 +0300 | ||
| Subject: [PATCH] build: 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, allow building the binaries for the host | ||
| platform and running them on the build platform with an emulator. | ||
|
|
||
| Based on Buildroot’s nodejs-src 0001-add-qemu-wrapper-support.patch. | ||
| https://gitlab.com/buildroot.org/buildroot/-/blob/c1d5eada4d4db9eeaa1c44dd1dea95a67c8a70ca/package/nodejs/nodejs-src/0001-add-qemu-wrapper-support.patch | ||
|
|
||
| Upstream: https://github.com/nodejs/node/pull/53899 | ||
| --- | ||
| common.gypi | 1 + | ||
| configure.py | 14 ++++++++++++++ | ||
| node.gyp | 3 +++ | ||
| tools/v8_gypfiles/v8.gyp | 4 ++++ | ||
| 4 files changed, 22 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..10dc0becbb 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='emulator command that can run executables built for the target system') | ||
| + | ||
| parser.add_argument('--cross-compiling', | ||
| action='store_true', | ||
| dest='cross_compiling', | ||
| @@ -2160,6 +2166,14 @@ write('config.mk', do_not_edit + config_str) | ||
| gyp_args = ['--no-parallel', '-Dconfiguring_node=1'] | ||
| gyp_args += ['-Dbuild_type=' + config['BUILDTYPE']] | ||
|
|
||
| +if options.emulator is not None: | ||
| + if not options.cross_compiling: | ||
| + # Note that emulator is a list so we have to quote the variable. | ||
| + gyp_args += ['-Demulator=' + shlex.quote(options.emulator)] | ||
| + else: | ||
| + # TODO: perhaps use emulator for tests? | ||
| + warn('The `--emulator` option has no effect when cross-compiling.') | ||
| + | ||
| if options.use_ninja: | ||
| gyp_args += ['-f', 'ninja-' + flavor] | ||
| elif flavor == 'win' and sys.platform != 'msys': | ||
| 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,146 @@ | ||
| From 999d918bc8fefec1752243743a47c0ce5380bcec Mon Sep 17 00:00:00 2001 | ||
| From: Ivan Trubach <mr.trubach@icloud.com> | ||
| Date: Wed, 17 Jul 2024 10:16:02 +0300 | ||
| Subject: [PATCH] build: 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, allow building the binaries for the host | ||
| platform and running them on the build platform with an emulator. | ||
|
|
||
| Based on Buildroot’s nodejs-src 0001-add-qemu-wrapper-support.patch. | ||
| https://gitlab.com/buildroot.org/buildroot/-/blob/c1d5eada4d4db9eeaa1c44dd1dea95a67c8a70ca/package/nodejs/nodejs-src/0001-add-qemu-wrapper-support.patch | ||
|
|
||
| Upstream: https://github.com/nodejs/node/pull/53899 | ||
| --- | ||
| common.gypi | 1 + | ||
| configure.py | 14 ++++++++++++++ | ||
| node.gyp | 4 ++++ | ||
| tools/v8_gypfiles/v8.gyp | 4 ++++ | ||
| 4 files changed, 23 insertions(+) | ||
|
|
||
| diff --git a/common.gypi b/common.gypi | ||
| index 154bbf2a0d..54d2afe3b3 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 f7e3310723..f7c7acdf4f 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='emulator command that can run executables built for the target system') | ||
| + | ||
| parser.add_argument('--cross-compiling', | ||
| action='store_true', | ||
| dest='cross_compiling', | ||
| @@ -2276,6 +2282,14 @@ if flavor == 'win' and python.lower().endswith('.exe'): | ||
| # will fail to run python scripts. | ||
| gyp_args += ['-Dpython=' + python] | ||
|
|
||
| +if options.emulator is not None: | ||
| + if not options.cross_compiling: | ||
| + # Note that emulator is a list so we have to quote the variable. | ||
| + gyp_args += ['-Demulator=' + shlex.quote(options.emulator)] | ||
| + else: | ||
| + # TODO: perhaps use emulator for tests? | ||
| + warn('The `--emulator` option has no effect when cross-compiling.') | ||
| + | ||
| if options.use_ninja: | ||
| gyp_args += ['-f', 'ninja-' + flavor] | ||
| elif flavor == 'win' and sys.platform != 'msys': | ||
| diff --git a/node.gyp b/node.gyp | ||
| index 9617596760..439c76aca6 100644 | ||
| --- a/node.gyp | ||
| +++ b/node.gyp | ||
| @@ -703,6 +703,7 @@ | ||
| '<(SHARED_INTERMEDIATE_DIR)/node_snapshot.cc', | ||
| ], | ||
| 'action': [ | ||
| + '<@(emulator)', | ||
| '<(node_mksnapshot_exec)', | ||
| '--build-snapshot', | ||
| '<(node_snapshot_main)', | ||
| @@ -722,6 +723,7 @@ | ||
| '<(SHARED_INTERMEDIATE_DIR)/node_snapshot.cc', | ||
| ], | ||
| 'action': [ | ||
| + '<@(emulator)', | ||
| '<@(_inputs)', | ||
| '<@(_outputs)', | ||
| ], | ||
| @@ -1010,6 +1012,7 @@ | ||
| '<(SHARED_INTERMEDIATE_DIR)/node_javascript.cc', | ||
| ], | ||
| 'action': [ | ||
| + '<@(emulator)', | ||
| '<(node_js2c_exec)', | ||
| '<@(_outputs)', | ||
| 'lib', | ||
| @@ -1477,6 +1480,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 d65a5c268e..5cd6c36b86 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)', | ||
| ], | ||
| @@ -453,6 +455,7 @@ | ||
| }], | ||
| ], | ||
| 'action': [ | ||
| + '<@(emulator)', | ||
| '>@(_inputs)', | ||
| '>@(mksnapshot_flags)', | ||
| ], | ||
| @@ -1842,6 +1845,7 @@ | ||
| 'action': [ | ||
| '<(python)', | ||
| '<(V8_ROOT)/tools/run.py', | ||
| + '<@(emulator)', | ||
| '<@(_inputs)', | ||
| '<@(_outputs)', | ||
| ], | ||
| -- | ||
| 2.44.1 | ||
|
|
tie marked this conversation as resolved.
Show resolved
Hide resolved
|
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 |
|---|---|---|
| @@ -1,13 +1,12 @@ | ||
| { lib, stdenv, fetchurl, openssl, python, zlib, libuv, http-parser, icu, bash | ||
| , ninja, pkgconf, unixtools, runCommand, buildPackages | ||
| , testers | ||
| # for `.pkgs` attribute | ||
| , callPackage | ||
| # Updater dependencies | ||
| , writeScript, coreutils, gnugrep, jq, curl, common-updater-scripts, nix, runtimeShell | ||
| , gnupg | ||
| , darwin | ||
| , installShellFiles | ||
| }: | ||
|
|
||
| @@ -16,35 +15,109 @@ | ||
| let | ||
| inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; | ||
|
|
||
| majorVersion = lib.versions.major version; | ||
| minorVersion = lib.versions.minor version; | ||
|
|
||
| pname = if enableNpm then "nodejs" else "nodejs-slim"; | ||
|
|
||
| canExecute = stdenv.buildPlatform.canExecute stdenv.hostPlatform; | ||
| emulator = stdenv.hostPlatform.emulator buildPackages; | ||
|
|
||
| # See valid_os and valid_arch in configure.py. | ||
| destOS = | ||
| let | ||
| platform = stdenv.hostPlatform; | ||
| in | ||
| if platform.isiOS then | ||
| "ios" | ||
| else if platform.isAndroid then | ||
| "android" | ||
| else if platform.isWindows then | ||
| "win" | ||
| else if platform.isDarwin then | ||
| "mac" | ||
| else if platform.isLinux then | ||
| "linux" | ||
| else if platform.isOpenBSD then | ||
| "openbsd" | ||
| else if platform.isFreeBSD then | ||
| "freebsd" | ||
| else | ||
| throw "unsupported os ${platform.uname.system}"; | ||
| destCPU = | ||
| let | ||
| platform = stdenv.hostPlatform; | ||
| in | ||
| if platform.isAarch then | ||
| "arm" + lib.optionalString platform.is64bit "64" | ||
| else if platform.isMips32 then | ||
| "mips" + lib.optionalString platform.isLittleEndian "le" | ||
| else if platform.isMips64 && platform.isLittleEndian then | ||
| "mips64el" | ||
| else if platform.isPower then | ||
| "ppc" + lib.optionalString platform.is64bit "64" | ||
| else if platform.isx86_64 then | ||
| "x64" | ||
| else if platform.isx86_32 then | ||
| "ia32" | ||
| else if platform.isS390x then | ||
| "s390x" | ||
| else if platform.isRiscV64 then | ||
| "riscv64" | ||
| else if platform.isLoongArch64 then | ||
| "loong64" | ||
| else | ||
| throw "unsupported cpu ${platform.uname.processor}"; | ||
|
There was a problem hiding this comment. This is not an idiomatic Nixpkgs pattern and should probably use some fallback for unknown platforms instead of throwing an error. I’m keeping it for now and will address this in subsequent code style PRs. There was a problem hiding this comment. It's fine to throw if we don't know the platform. |
||
| destARMFPU = | ||
| let | ||
| platform = stdenv.hostPlatform; | ||
| in | ||
| if platform.isAarch32 && platform ? gcc.fpu then | ||
| lib.throwIfNot (builtins.elem platform.gcc.fpu [ | ||
| "vfp" | ||
| "vfpv2" | ||
| "vfpv3" | ||
| "vfpv3-d16" | ||
| "neon" | ||
| ]) "unsupported ARM FPU ${platform.gcc.fpu}" platform.gcc.fpu | ||
| else | ||
| null; | ||
| destARMFloatABI = | ||
| let | ||
| platform = stdenv.hostPlatform; | ||
| in | ||
| if platform.isAarch32 && platform ? gcc.float-abi then | ||
| lib.throwIfNot (builtins.elem platform.gcc.float-abi [ | ||
| "soft" | ||
| "softfp" | ||
| "hard" | ||
| ]) "unsupported ARM float ABI ${platform.gcc.float-abi}" platform.gcc.float-abi | ||
| else | ||
| null; | ||
| # TODO: also handle MIPS flags (mips_arch, mips_fpu, mips_float_abi). | ||
|
|
||
| useSharedHttpParser = !stdenv.hostPlatform.isDarwin && lib.versionOlder "${majorVersion}.${minorVersion}" "11.4"; | ||
|
|
||
| sharedLibDeps = { inherit openssl zlib libuv; } // (lib.optionalAttrs useSharedHttpParser { inherit http-parser; }); | ||
|
|
||
| copyLibHeaders = | ||
| map | ||
| (name: "${lib.getDev sharedLibDeps.${name}}/include/*") | ||
| (builtins.attrNames sharedLibDeps); | ||
|
|
||
| # Currently stdenv sets CC/LD/AR/etc environment variables to program names | ||
| # instead of absolute paths. If we add cctools to nativeBuildInputs, that | ||
| # would shadow stdenv’s bintools and potentially break other parts of the | ||
| # build. The correct behavior is to use absolute paths, and there is a PR for | ||
| # that, see https://github.com/NixOS/nixpkgs/pull/314920. As a temporary | ||
| # workaround, we use only a single program we need (and that is not part of | ||
| # the stdenv). | ||
| darwin-cctools-only-libtool = | ||
| # Would be nice to have onlyExe builder similar to onlyBin… | ||
| runCommand "darwin-cctools-only-libtool" { cctools = lib.getBin buildPackages.cctools; } '' | ||
| mkdir -p "$out/bin" | ||
| ln -s "$cctools/bin/libtool" "$out/bin/libtool" | ||
| ''; | ||
|
|
||
| package = stdenv.mkDerivation (finalAttrs: | ||
| let | ||
| @@ -61,58 +134,90 @@ let | ||
|
|
||
| strictDeps = true; | ||
|
|
||
| env = { | ||
| # Tell ninja to avoid ANSI sequences, otherwise we don’t see build | ||
| # progress in Nix logs. | ||
| # | ||
| # Note: do not set TERM=dumb environment variable globally, it is used in | ||
| # test-ci-js test suite to skip tests that otherwise run fine. | ||
| NINJA = "TERM=dumb ninja"; | ||
|
There was a problem hiding this comment. Not setting There was a problem hiding this comment. We should write that into a comment There was a problem hiding this comment. Hmm, this is unfortunate. I think Nix build environments have enough of a PTY to run these tests, but we’re using There was a problem hiding this comment. These tests run fine unless There was a problem hiding this comment. Yeah. We could override |
||
| } // lib.optionalAttrs (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) { | ||
| # Make sure libc++ uses `posix_memalign` instead of `aligned_alloc` on x86_64-darwin. | ||
| # Otherwise, nodejs would require the 11.0 SDK and macOS 10.15+. | ||
| NIX_CFLAGS_COMPILE = "-D__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__=101300 -Wno-macro-redefined"; | ||
| }; | ||
|
|
||
| # NB: technically, we do not need bash in build inputs since all scripts are | ||
| # wrappers over the corresponding JS scripts. There are some packages though | ||
| # that use bash wrappers, e.g. polaris-web. | ||
| buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ApplicationServices ] | ||
| ++ [ zlib libuv openssl http-parser icu bash ]; | ||
|
|
||
| nativeBuildInputs = | ||
| [ | ||
| installShellFiles | ||
| ninja | ||
| pkgconf | ||
| python | ||
| ] | ||
| ++ lib.optionals stdenv.buildPlatform.isDarwin [ | ||
| # gyp checks `sysctl -n hw.memsize` if `sys.platform == "darwin"`. | ||
| unixtools.sysctl | ||
| ] | ||
| ++ lib.optionals stdenv.hostPlatform.isDarwin [ | ||
| # For gyp-mac-tool if `flavor == "mac"`. | ||
| darwin-cctools-only-libtool | ||
| ]; | ||
|
|
||
| # We currently rely on Makefile and stdenv for build phases, so do not let | ||
| # ninja’s setup hook to override default stdenv phases. | ||
| dontUseNinjaBuild = true; | ||
| dontUseNinjaCheck = true; | ||
| dontUseNinjaInstall = true; | ||
|
|
||
| outputs = [ "out" "libv8" ]; | ||
| setOutputFlags = false; | ||
| moveToDev = false; | ||
|
|
||
| configureFlags = | ||
| [ | ||
| "--ninja" | ||
| "--with-intl=system-icu" | ||
| "--openssl-use-def-ca-store" | ||
| "--no-cross-compiling" | ||
| "--dest-os=${destOS}" | ||
| "--dest-cpu=${destCPU}" | ||
| ] | ||
| ++ lib.optionals (destARMFPU != null) [ "--with-arm-fpu=${destARMFPU}" ] | ||
| ++ lib.optionals (destARMFloatABI != null) [ "--with-arm-float-abi=${destARMFloatABI}" ] | ||
| ++ lib.optionals (!canExecute) [ | ||
| # Node.js requires matching bitness between build and host platforms, e.g. | ||
| # for V8 startup snapshot builder (see tools/snapshot) and some other | ||
| # tools. We apply a patch that runs these tools using a host platform | ||
| # emulator and avoid cross-compiling altogether (from the build system’s | ||
| # perspective). | ||
| "--emulator=${emulator}" | ||
| ] | ||
| ++ lib.optionals (lib.versionOlder version "19") [ "--without-dtrace" ] | ||
| ++ lib.optionals (!enableNpm) [ "--without-npm" ] | ||
| ++ lib.concatMap (name: [ | ||
| "--shared-${name}" | ||
| "--shared-${name}-libpath=${lib.getLib sharedLibDeps.${name}}/lib" | ||
| /** | ||
| Closure notes: we explicitly avoid specifying --shared-*-includes, | ||
| as that would put the paths into bin/nodejs. | ||
| Including pkg-config in build inputs would also have the same effect! | ||
| FIXME: the statement above is outdated, we have to include pkg-config | ||
| in build inputs for system-icu. | ||
| */ | ||
| ]) (builtins.attrNames sharedLibDeps); | ||
|
|
||
| configurePlatforms = [ ]; | ||
|
|
||
| dontDisableStatic = true; | ||
|
|
||
| configureScript = writeScript "nodejs-configure" '' | ||
| exec ${python.executable} configure.py "$@" | ||
| ''; | ||
|
|
||
| @@ -140,9 +245,10 @@ let | ||
|
|
||
| __darwinAllowLocalNetworking = true; # for tests | ||
|
|
||
| doCheck = canExecute; | ||
|
|
||
| # See https://github.com/nodejs/node/issues/22006 | ||
| enableParallelChecking = false; | ||
|
Comment on lines
+250
to
+251
There was a problem hiding this comment. It seems like upstream hasn’t seen any issues here for years and closed this issue as a result. I’m wondering if it really is an upstream issue, but if so, it’d be good to ping the issue with example logs to hopefully get it reopened (and maybe even fixed). |
||
|
|
||
| # Some dependencies required for tools/doc/node_modules (and therefore | ||
| # test-addons, jstest and others) target are not included in the tarball. | ||
| @@ -158,8 +264,6 @@ let | ||
| # than a year (Node.js 18 will be EOL at 2025-04-30). Note that these | ||
| # failures are specific to Nix sandbox on macOS and should not affect | ||
| # actual functionality. | ||
| "test-ci-js" | ||
| ]); | ||
|
|
||
| @@ -182,7 +286,7 @@ let | ||
| "test-tls-cli-max-version-1.3" | ||
| "test-tls-client-auth" | ||
| "test-tls-sni-option" | ||
| ] ++ lib.optionals stdenv.buildPlatform.isDarwin [ | ||
| # Disable tests that don’t work under macOS sandbox. | ||
| "test-macos-app-sandbox" | ||
| "test-os" | ||
| @@ -207,18 +311,23 @@ let | ||
| "test-runner-run" | ||
| "test-runner-watch-mode" | ||
| "test-watch-mode-files_watcher" | ||
| ] ++ lib.optionals (stdenv.buildPlatform.isDarwin && stdenv.buildPlatform.isx86_64) [ | ||
| # These tests fail on x86_64-darwin (even without sandbox). | ||
| # TODO: revisit at a later date. | ||
| "test-fs-readv" | ||
| "test-fs-readv-sync" | ||
| ])}" | ||
| ]; | ||
|
|
||
| postInstall = '' | ||
| HOST_PATH=$out/bin patchShebangs --host $out | ||
| ${lib.optionalString canExecute '' | ||
| $out/bin/node --completion-bash > node.bash | ||
| installShellCompletion node.bash | ||
tie marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| ''} | ||
| ${lib.optionalString enableNpm '' | ||
| mkdir -p $out/share/bash-completion/completions | ||
| ln -s $out/lib/node_modules/npm/lib/utils/completion.sh \ | ||
| $out/share/bash-completion/completions/npm | ||
| @@ -231,24 +340,14 @@ let | ||
| ''} | ||
| # install the missing headers for node-gyp | ||
| # TODO: add dev output and use propagatedBuildInputs instead of copying headers. | ||
| cp -r ${lib.concatStringsSep " " copyLibHeaders} $out/include/node | ||
| # assemble a static v8 library and put it in the 'libv8' output | ||
| mkdir -p $libv8/lib | ||
| pushd out/Release/obj | ||
| find . -path "./torque_*/**/*.o" -or -path "./v8*/**/*.o" | sort -u >files | ||
| $AR -cqs $libv8/lib/libv8.a @files | ||
|
There was a problem hiding this comment. Note: before this change, we had fallback for That is, I think we can assume that There was a problem hiding this comment. In the future, ideally, we should update v8 package and avoid using nodejs as v8 library provider. There was a problem hiding this comment. You could set Darwin bintools has been using |
||
| popd | ||
| # copy v8 headers | ||
| @@ -290,14 +389,6 @@ let | ||
| platforms = platforms.linux ++ platforms.darwin; | ||
| mainProgram = "node"; | ||
| knownVulnerabilities = optional (versionOlder version "18") "This NodeJS release has reached its end of life. See https://nodejs.org/en/about/releases/."; | ||
| }; | ||
|
|
||
| passthru.python = python; # to ensure nodeEnv uses the same version | ||
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
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
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please delete the old code instead of commenting it
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That would be inconsistent with the part of the patch that applies to the other copy of this code, which was already in‐tree. Is it important enough to re‐do the whole patch over?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
See #327653 (comment)
I don’t think it’s worth redoing this patch in the context of this PR.