rubyjs
diff --git a/‎build-libv8
Lines changed: 1 addition & 18 deletions b/‎build-libv8
Lines changed: 1 addition & 18 deletions
diff --git a/‎extract-node
Lines changed: 0 additions & 12 deletions b/‎extract-node
Lines changed: 0 additions & 12 deletions
diff --git a/‎gyp-libv8_monolith.patch
Lines changed: 8 additions & 14 deletions b/‎gyp-libv8_monolith.patch
Lines changed: 8 additions & 14 deletions
diff --git a/‎py2-icutrim.patch
Lines changed: 0 additions & 14 deletions b/‎py2-icutrim.patch
Lines changed: 0 additions & 14 deletions
diff --git a/‎py3-genv8constants.patch
Lines changed: 0 additions & 20 deletions b/‎py3-genv8constants.patch
Lines changed: 0 additions & 20 deletions
@@ -14,24 +14,7 @@ echo "parallel job count: ${NJOBS}"
 
 cd "src/node-${version}"
 
-if which python3 >/dev/null 2>&1; then
-    PYTHON="${PYTHON:-python3}"
-else
-    PYTHON="${PYTHON:-python2}"
-fi
-
-case "${platform}" in
-    SunOS)
-        export CC="${CC:-/opt/local/gcc7/bin/gcc}"
-        export CXX="${CXX:-/opt/local/gcc7/bin/g++}"
-        ;;
-    *)
-        if cc --version | grep 4.9 >/dev/null; then
-            export CC="${CC:-clang}"
-            export CXX="${CXX:-clang++}"
-        fi
-        ;;
-esac
+PYTHON="${PYTHON:-python2}"
 
 "${PYTHON}" configure --openssl-no-asm --without-npm --shared --with-intl=small-icu
 make BUILDTYPE=Release config.gypi
 
@@ -21,16 +21,4 @@ esac
 cd "src/node-${version}"
 
 patch -p1 < ../../gyp-libv8_monolith.patch
-patch -p1 < ../../py2-icutrim.patch
 patch -p1 < ../../py2-genv8constants.patch
-
-# TODO: the following still fails on py3 so the above one forcing py2 is needed
-# patch -p1 < ../../py3-genv8constants.patch
-#
-# This is the error:
-#
-#     Traceback (most recent call last):
-#       File "tools/genv8constants.py", line 99, in <module>
-#         curr_val += int('0x%s' % octetstr, 16) << (curr_octet * 8)
-#     ValueError: invalid literal for int() with base 16: "0xb'04 '"
-#     node_dtrace_ustack.target.mk:13: recipe for target '/usbkey/user_home/vagrant/ruby-libv8-node/src/node-14.14.0/out/Release/obj/gen/v8constants.h' failed
@@ -3,35 +3,29 @@
@@ -1467,6 +1467,16 @@
          }],
        ],
-     }, # node_mksnapshot
+     }, # cctest
 +    {
 +      'target_name': 'libv8_monolith',
 +      'type': 'none',
 +      'includes': [
 +        'node.gypi'
 +      ],
 +      #'dependencies': [
-+      #  'tools/v8_gypfiles/v8.gyp:v8_monolith',
++      #  'deps/v8/gypfiles/v8.gyp:v8_monolith',
 +      #],
 +    },
    ], # end targets
 
    'conditions': [
---- a/tools/v8_gypfiles/v8.gyp	2020-11-04 16:34:06.000000000 +0100
-+++ b/tools/v8_gypfiles/v8.gyp	2020-11-04 16:34:10.000000000 +0100
-@@ -1726,5 +1726,21 @@
-         '<(V8_ROOT)/third_party/zlib/google/compression_utils_portable.h',
-       ],
-     },  # v8_zlib
+--- a/deps/v8/gypfiles/v8.gyp	2020-11-04 16:34:06.000000000 +0100
++++ b/deps/v8/gypfiles/v8.gyp	2020-11-04 16:34:10.000000000 +0100
+@@ -1726,5 +1726,15 @@
+     {
+       'includes': [ 'v8_external_snapshot.gypi' ],
+     }, # v8_external_snapshot
 +    {
 +      'target_name': 'v8_monolith',
 +      'type': 'static_library',
-+      'sources': [
-+        '<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn"  "\\"v8.*?sources = ")',
-+        '<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn"  "\\"v8_libbase.*?sources = ")',
-+        '<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn"  "\\"v8_libplatform.*?sources = ")',
-+        '<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn"  "\\"v8_libsampler.*?sources = ")',
-+      ],
 +      'dependencies': [
 +        'v8',
 +        'v8_libbase',