fixup! build: add --without-bundled-v8-third_party configure flag

Author: aduh95

Makefile

@@ -1251,10 +1251,7 @@ ifeq ($(SKIP_SHARED_DEPS), 1)
 	$(RM) -r $(TARNAME)/deps/sqlite
 	$(RM) -r $(TARNAME)/deps/uv
 	$(RM) -r $(TARNAME)/deps/uvwasi
-	$(RM) -r $(TARNAME)/deps/v8/third_party/abseil-cpp
-	$(RM) -r $(TARNAME)/deps/v8/third_party/highway
-	$(RM) -r $(TARNAME)/deps/v8/third_party/simdutf
-	$(RM) -r $(TARNAME)/deps/v8/third_party/zlib
+	$(RM) -r $(TARNAME)/deps/v8/third_party
 	$(RM) -r $(TARNAME)/deps/zlib
 	$(RM) -r $(TARNAME)/deps/zstd
 else

node.gyp

@@ -894,7 +894,6 @@
         '<(SHARED_INTERMEDIATE_DIR)' # for node_natives.h
       ],
       'dependencies': [
-        'tools/v8_gypfiles/abseil.gyp:abseil',
         'node_js2c#host',
       ],
 
@@ -955,6 +954,11 @@
             'src/node_snapshot_stub.cc',
           ]
         }],
+        [ 'node_use_bundled_v8_third_party!="false"', {
+          'dependencies': [
+            'tools/v8_gypfiles/abseil.gyp:abseil',
+          ],
+        }],
         [ 'node_shared_gtest=="false"', {
           'dependencies': [
             'deps/googletest/googletest.gyp:gtest_prod',
@@ -1275,7 +1279,6 @@
 
       'dependencies': [
         '<(node_lib_target_name)',
-        'tools/v8_gypfiles/abseil.gyp:abseil',
       ],
 
       'includes': [
@@ -1309,6 +1312,11 @@
         [ 'node_shared_gtest=="true"', {
           'libraries': [ '-lgtest_main' ],
         }],
+        [ 'node_use_bundled_v8_third_party!="false"', {
+          'dependencies': [
+            'tools/v8_gypfiles/abseil.gyp:abseil',
+          ],
+        }],
         [ 'node_shared_hdr_histogram=="false"', {
           'dependencies': [
             'deps/histogram/histogram.gyp:histogram',
@@ -1547,7 +1555,7 @@
         [ 'OS=="mac"', {
           'libraries': [ '-framework CoreFoundation -framework Security' ],
         }],
-        [ 'node_shared_simdutf=="false"', {
+        [ 'node_shared_simdutf=="false" and node_use_bundled_v8_third_party!="false"', {
           'dependencies': [ 'tools/v8_gypfiles/v8.gyp:simdutf#host' ],
         }],
         [ 'node_shared_libuv=="false"', {

tools/nix/v8-third_party/default.nix

@@ -25,6 +25,7 @@ symlinkJoin {
 
   paths = [
     (callPackage ./abseil-cpp.nix { })
+    (callPackage ./fp16.nix { })
     (callPackage ./highway.nix { })
     (callPackage ./simdutf.nix { })
     (callPackage ./zlib.nix { })
@@ -63,7 +64,7 @@ symlinkJoin {
           "-lv8_zlib"
         ]
       }
-      Cflags: -I$out/include
+      Cflags: -I$out/include -I$out/include/third_party/simdutf
     EOF
     install -Dm0644 v8-third_party.pc -t $out/lib/pkgconfig
   '';

tools/nix/v8-third_party/fp16.nix

@@ -0,0 +1,45 @@
+{
+  stdenv,
+  fetchgit,
+  cmake,
+  skipCheck ? false, # update-v8-dep-nix.sh uses this to parse the file
+}:
+
+let
+  # Values from deps/v8/DEPS - third_party/fp16
+  url = "https://chromium.googlesource.com/external/github.com/Maratyszcza/FP16.git";
+  rev = "3d2de1816307bac63c16a297e8c4dc501b4076df";
+
+  hash =
+    let
+      v8Deps = builtins.match (
+        ".*'chromium_url': '([^']+)',.*"
+        + "'third_party/fp16/src':"
+        + "[^']+Var\\('chromium_url'\\) ?\\+ ?'([^']+)' ?\\+ ?'@' ?\\+ ?'([a-f0-9]+)',.*"
+      ) (builtins.readFile ../../../deps/v8/DEPS);
+      expectedURL =
+        if v8Deps == null then
+          throw "v8/DEPS missing or not parsable"
+        else
+          "${builtins.elemAt v8Deps 0}${builtins.elemAt v8Deps 1}";
+      expectedRev = builtins.elemAt v8Deps 2;
+    in
+    if skipCheck == false && (expectedURL != url || expectedRev != rev) then
+      throw "Please run tools/nix/v8-third_party/update-dep-nix.sh fp16\n - Expected: ${expectedURL}@${expectedRev}\n - Got:      ${url}@${rev}"
+    else
+      "sha256-CR7h1d9RFE86l6btk4N8vbQxy0KQDxSMvckbiO87JEg=";
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "fp16";
+  version = "0-unstable-2022-10-24";
+
+  src = fetchgit {
+    inherit url rev hash;
+  };
+
+  doBuild = false;
+  installPhase = ''
+    install -Dm0644 include/fp16.h -t $out/include/third_party/fp16/src/include
+    install -Dm0644 include/fp16/*.h -t $out/include/third_party/fp16/src/include/fp16
+  '';
+})

tools/nix/v8-third_party/highway.nix

@@ -29,10 +29,17 @@ let
       "sha256-HNrlqtAs1vKCoSJ5TASs34XhzjEbLW+ISco1NQON+BI=";
   version = "1.3.0";
 in
-libhwy.overrideAttrs {
+libhwy.overrideAttrs (old: {
   inherit version;
 
   src = fetchgit {
     inherit url rev hash;
   };
-}
+
+  postPatch = ''
+    substituteInPlace hwy/ops/set_macros-inl.h \
+       --replace-fail '",avx10.2-512"' '""'
+  '';
+
+  doCheck = false;
+})

tools/nix/v8-third_party/simdutf.nix

@@ -41,17 +41,17 @@ stdenv.mkDerivation {
   buildPhase =
     if stdenv.buildPlatform.isDarwin then
       ''
-        $CXX -dynamiclib simdutf.cpp \
+        $CXX -std=c++20 -dynamiclib simdutf.cpp \
           -o libsimdutf.dylib \
           -install_name $out/lib/libsimdutf.dylib
       ''
     else
       ''
-        $CXX -fPIC -shared simdutf.cpp \
-          -o libsimdutf.dylib
+        $CXX -std=c++20 -fPIC -shared simdutf.cpp \
+          -o libsimdutf.so
       '';
   installPhase = ''
-    install -Dm0644 libsimdutf.dylib -t $out/lib
+    install -Dm0644 libsimdutf.* -t $out/lib
     install -Dm0644 simdutf.h -t $out/include/third_party/simdutf
 
     cat -> simdutf.pc <<EOF

tools/nix/v8-third_party/update-dep-nix.sh

@@ -21,7 +21,7 @@ fi
 
 echo "Extracting values from deps/v8/DEPS..."
 
-DEP_SRC=$(awk "/^ *\u0027third_party[\u002f]$DEP_NAME([\u002f]src)?\u0027: ?\{?$/{ getline; print }" "$DEPS_FILE")
+DEP_SRC=$(sed -n "/^ \\{0,\\}'third_party.$DEP_NAME\\(.src\\)\\{0,1\\}': \\{0,1\\}{\\{0,1\\}\$/{n;p;}" "$DEPS_FILE")
 
 echo "$DEP_SRC" | grep -q "Var('chromium_url') \?+ \?'.\+' \?+ \?'@' \?+ \?'.\+',$" || {
   echo "Unexpected format for $DEP_NAME source URL: $DEP_SRC"

tools/nix/v8-third_party/zlib.nix

@@ -25,24 +25,34 @@ let
       expectedRev = builtins.elemAt v8Deps 2;
     in
     if skipCheck == false && (expectedURL != url || expectedRev != rev) then
-      throw "Please run tools/nix/update-v8-dep-nix.sh zlib\n - Expected: ${expectedURL}@${expectedRev}\n - Got:      ${url}@${rev}"
+      throw "Please run tools/nix/v8-third_party/update-dep-nix.sh zlib\n - Expected: ${expectedURL}@${expectedRev}\n - Got:      ${url}@${rev}"
     else
       "sha256-d01Vdo+kZ43AhES5MYGFae67fH6L6ATh3xQadMu7Hw0=";
 in
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "v8_zlib";
   version = "1.3.1";
 
   src = fetchgit {
     inherit url rev hash;
   };
   postPatch = ''
-    substituteInPlace CMakeLists.txt --replace-fail 'OUTPUT_NAME z' 'OUTPUT_NAME v8_zlib'
+    substituteInPlace CMakeLists.txt \
+      --replace-fail 'OUTPUT_NAME z' 'OUTPUT_NAME v8_zlib' \
+      --replace-fail 'set_target_properties(zlib PROPERTIES LINK_FLAGS "-Wl,--version-script,\"''${CMAKE_CURRENT_SOURCE_DIR}/zlib.map\"")' ' ' \
+      --replace-fail 'INSTALL_INC_DIR "''${CMAKE_INSTALL_PREFIX}/include"' 'INSTALL_INC_DIR "''${CMAKE_INSTALL_PREFIX}/include/third_party/zlib"' \
+      --replace-fail 'set(ZLIB_PUBLIC_HDRS' 'set(ZLIB_PUBLIC_HDRS chromeconf.h google/compression_utils_portable.h' \
+      --replace-fail 'set(ZLIB_SRCS' 'set(ZLIB_SRCS google/compression_utils_portable.cc'
+  '';
+
+  NIX_CFLAGS_COMPILE = ''
+    -DZLIB_IMPLEMENTATION
+    -include ${finalAttrs.src}/chromeconf.h
   '';
 
   nativeBuildInputs = [ cmake ];
   postInstall = ''
-    mkdir -p $out/include/third_party/zlib
-    mv $out/include/*.h $out/include/third_party/zlib/.
+    mkdir $out/include/third_party/zlib/google
+    mv $out/include/third_party/zlib/compression_utils_portable.h $out/include/third_party/zlib/google/.
   '';
-}
+})

tools/nix/v8.nix

@@ -41,7 +41,7 @@ pkgs.stdenv.mkDerivation (finalAttrs: {
         ../../configure.py
         ../../deps/inspector_protocol/inspector_protocol.gyp
         ../../deps/ncrypto/ncrypto.gyp
-        ../../deps/v8
+        (fileset.difference ../../deps/v8 ../../deps/v8/third_party)
         ../../node.gyp
         ../../node.gypi
         ../../src/inspector/node_inspector.gypi