deps,test: fixed failures

Signed-off-by: Paolo Insogna <paolo@cowtech.it>

Author: ShogunPanda

.github/workflows/test-shared.yml

@@ -196,7 +196,7 @@ jobs:
             --arg ccache "${NIX_SCCACHE:-null}" \
             --arg devTools '[]' \
             --arg benchmarkTools '[]' \
-            ${{ endsWith(matrix.system, '-darwin') && '--arg withAmaro false --arg withLief false --arg withSQLite false --arg extraConfigFlags ''["--without-inspector" "--without-node-options"]'' \' || '\' }}
+            ${{ endsWith(matrix.system, '-darwin') && '--arg withAmaro false --arg withLief false --arg withSQLite false --arg withFFI false --arg extraConfigFlags ''["--without-inspector" "--without-node-options"]'' \' || '\' }}
             --run '
                 make -C "$TAR_DIR" run-ci -j4 V=1 TEST_CI_ARGS="-p actions --measure-flakiness 9 --skip-tests=$CI_SKIP_TESTS"
             ' "$TAR_DIR/shell.nix"

deps/libffi/preprocess_asm.py

@@ -32,21 +32,27 @@ def find_compiler():
     raise RuntimeError('Unable to locate a compiler for preprocessing assembly')
 
 
+def normalize_path(value):
+    return str(value).strip().strip('"')
+
+
 def preprocess(args):
     compiler = find_compiler()
-    output = Path(args.output)
+    input_path = normalize_path(args.input)
+    output = Path(normalize_path(args.output))
+    include_dirs = [normalize_path(include_dir) for include_dir in args.include_dir]
     output.parent.mkdir(parents=True, exist_ok=True)
 
     if os.name == 'nt' and Path(compiler[0]).name.lower() in ('cl.exe', 'cl', 'clang-cl.exe', 'clang-cl'):
         command = compiler + ['/nologo', '/EP', '/TC']
-        command += [f'/I{include_dir}' for include_dir in args.include_dir]
+        command += [f'/I{include_dir}' for include_dir in include_dirs]
         command += [f'/D{define}' for define in args.define]
-        command += [args.input]
+        command += [input_path]
     else:
         command = compiler + ['-E', '-P', '-x', 'c']
-        command += [f'-I{include_dir}' for include_dir in args.include_dir]
+        command += [f'-I{include_dir}' for include_dir in include_dirs]
         command += [f'-D{define}' for define in args.define]
-        command += [args.input]
+        command += [input_path]
 
     result = subprocess.run(command, capture_output=True, text=True)
     if result.returncode != 0:

lib/internal/process/permission.js

@@ -1,7 +1,6 @@
 'use strict';
 
 const {
-  Boolean,
   ObjectFreeze,
 } = primordials;
 

shell.nix

@@ -16,6 +16,7 @@
   withLief ? true,
   withQuic ? false,
   withSQLite ? true,
+  withFFI ? true,
   withSSL ? true,
   withTemporal ? false,
   sharedLibDeps ?
@@ -26,6 +27,7 @@
           withLief
           withQuic
           withSQLite
+          withFFI
           withSSL
           withTemporal
           ;
@@ -61,6 +63,7 @@ let
   ++ pkgs.lib.optional (!withLief) "--without-lief"
   ++ pkgs.lib.optional withQuic "--experimental-quic"
   ++ pkgs.lib.optional (!withSQLite) "--without-sqlite"
+  ++ pkgs.lib.optional (!withFFI) "--without-ffi"
   ++ pkgs.lib.optional (!withSSL) "--without-ssl"
   ++ pkgs.lib.optional withTemporal "--v8-enable-temporal-support"
   ++ pkgs.lib.optional (ninja != null) "--ninja"

src/node_metadata.cc

@@ -17,7 +17,7 @@
 #endif  // HAVE_SQLITE
 #if HAVE_FFI
 #include "ffi.h"
-#endif  // HAVE_FFI && !NODE_SHARED_FFI
+#endif  // HAVE_FFI
 #include "undici_version.h"
 #include "util.h"
 #include "uv.h"

test/parallel/test-process-get-builtin.mjs

@@ -1,4 +1,4 @@
-import { hasCrypto, hasIntl, hasInspector, hasSQLite, hasFFI } from '../common/index.mjs';
+import { hasCrypto, hasIntl, hasInspector, hasSQLite } from '../common/index.mjs';
 import assert from 'node:assert';
 import { builtinModules } from 'node:module';
 import { isMainThread } from 'node:worker_threads';

tools/nix/sharedLibDeps.nix

@@ -4,6 +4,7 @@
   withQuic ? false,
   withSQLite ? true,
   withSSL ? true,
+  withFFI ? true,
   withTemporal ? false,
 }:
 {
@@ -20,7 +21,6 @@
     zlib
     zstd
     ;
-  ffi = pkgs.libffi;
   cares = pkgs.c-ares;
   hdr-histogram = pkgs.hdrhistogram_c;
   http-parser = pkgs.llhttp;
@@ -47,6 +47,9 @@
 // (pkgs.lib.optionalAttrs withSQLite {
   inherit (pkgs) sqlite;
 })
+// (pkgs.lib.optionalAttrs withFFI {
+  inherit (pkgs) ffi;
+})
 // (pkgs.lib.optionalAttrs withSSL (
   let
     version = "3.5.5";