diff --git a/lib/libv8/node/version.rb b/lib/libv8/node/version.rb index 824a990..80a093f 100644 --- a/lib/libv8/node/version.rb +++ b/lib/libv8/node/version.rb @@ -4,7 +4,7 @@ module Libv8 end module Libv8::Node - VERSION = '22.7.0.4' - NODE_VERSION = '22.7.0' + VERSION = '22.9.0.0' + NODE_VERSION = '22.9.0' LIBV8_VERSION = '12.4.254.21' # from src/node-.../deps/v8/include/v8-version.h end diff --git a/libexec/build-libv8 b/libexec/build-libv8 index 128ef20..f19b58f 100755 --- a/libexec/build-libv8 +++ b/libexec/build-libv8 @@ -19,7 +19,7 @@ cd "${src}/node-v${version}" # Maglev is disabled because of a suspected x64 snapshot regression in # DoComputeOutputFrames -configure_flags='--v8-disable-maglev --openssl-no-asm --without-npm --shared --with-intl=full-icu' +configure_flags='--openssl-no-asm --without-npm --shared --with-intl=full-icu' eval "$("${libexec}/platform")" echo "configure: ${configure_flags}" diff --git a/libexec/extract-node b/libexec/extract-node index 3c62fb7..6dcbf2b 100755 --- a/libexec/extract-node +++ b/libexec/extract-node @@ -29,21 +29,5 @@ extract "${src}" "${src}/node-v${version}.tar.gz" cd "${src}/node-v${version}" -#patch -p1 < "${top}"/patch/gyp-libv8_monolith.patch -#patch -p1 < "${top}"/patch/py2-icutrim.patch -#patch -p1 < "${top}"/patch/py2-genv8constants.patch -patch -p1 < "${top}"/patch/v8-no-assert-trivially-copyable.patch patch -p1 < "${top}"/patch/v8-disable-madv-dontfork.patch patch -p1 < "${top}"/patch/v8-disable-pkey.patch -patch -p1 < "${top}"/patch/v8-disable-marking.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 -# 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 diff --git a/patch/gyp-libv8_monolith.patch b/patch/gyp-libv8_monolith.patch deleted file mode 100644 index af99a51..0000000 --- a/patch/gyp-libv8_monolith.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- a/node.gyp 2020-11-04 15:55:48.000000000 +0100 -+++ b/node.gyp 2020-11-04 15:55:51.000000000 +0100 -@@ -1467,6 +1467,16 @@ - }], - ], - }, # node_mksnapshot -+ { -+ 'target_name': 'libv8_monolith', -+ 'type': 'none', -+ 'includes': [ -+ 'node.gypi' -+ ], -+ #'dependencies': [ -+ # 'tools/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 -+ { -+ 'target_name': 'v8_monolith', -+ 'type': 'static_library', -+ 'sources': [ -+ ':')) --v8dbg = re.compile(bytes('^v8dbg.*$')) --numpattern = re.compile(bytes('^[0-9a-fA-F]{2} $')) -+if str == bytes: -+ pattern = re.compile(bytes('([0-9a-fA-F]{8}|[0-9a-fA-F]{16}) <(.*)>:')) -+ v8dbg = re.compile(bytes('^v8dbg.*$')) -+ numpattern = re.compile(bytes('^[0-9a-fA-F]{2} $')) -+else: -+ pattern = re.compile(bytes('([0-9a-fA-F]{8}|[0-9a-fA-F]{16}) <(.*)>:', 'utf-8')) -+ v8dbg = re.compile(bytes('^v8dbg.*$', 'utf-8')) -+ numpattern = re.compile(bytes('^[0-9a-fA-F]{2} $', 'utf-8')) - octets = 4 - - outfile.write(""" diff --git a/patch/v8-disable-marking.patch b/patch/v8-disable-marking.patch deleted file mode 100644 index 32973a9..0000000 --- a/patch/v8-disable-marking.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/deps/v8/src/flags/flag-definitions.h b/deps/v8/src/flags/flag-definitions.h -index 0d50ac1522..2854768562 100644 ---- a/deps/v8/src/flags/flag-definitions.h -+++ b/deps/v8/src/flags/flag-definitions.h -@@ -1764,7 +1764,7 @@ DEFINE_BOOL(minor_ms_trace_fragmentation, false, - DEFINE_BOOL(trace_evacuation, false, "report evacuation statistics") - DEFINE_BOOL(trace_mutator_utilization, false, - "print mutator utilization, allocation speed, gc speed") --DEFINE_BOOL(incremental_marking, true, "use incremental marking") -+DEFINE_BOOL(incremental_marking, false, "use incremental marking") - DEFINE_BOOL(incremental_marking_bailout_when_ahead_of_schedule, true, - "bails out of incremental marking when ahead of schedule") - DEFINE_BOOL(incremental_marking_task, true, "use tasks for incremental marking") -@@ -1794,7 +1794,7 @@ DEFINE_IMPLICATION(cppgc_young_generation, minor_ms) - DEFINE_NEG_IMPLICATION(cppgc_young_generation, reclaim_unmodified_wrappers) - DEFINE_BOOL(optimize_gc_for_battery, false, "optimize GC for battery") - #if defined(V8_ATOMIC_OBJECT_FIELD_WRITES) --DEFINE_BOOL(concurrent_marking, true, "use concurrent marking") -+DEFINE_BOOL(concurrent_marking, false, "use concurrent marking") - #else - // Concurrent marking cannot be used without atomic object field loads and - // stores. diff --git a/patch/v8-no-assert-trivially-copyable.patch b/patch/v8-no-assert-trivially-copyable.patch deleted file mode 100644 index 2148c14..0000000 --- a/patch/v8-no-assert-trivially-copyable.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/deps/v8/src/base/small-vector.h b/deps/v8/src/base/small-vector.h -index edaab3a7a6..533a536178 100644 ---- a/deps/v8/src/base/small-vector.h -+++ b/deps/v8/src/base/small-vector.h -@@ -20,9 +20,6 @@ namespace base { - // dynamic storage when it overflows. - template > - class SmallVector { -- // Currently only support trivially copyable and trivially destructible data -- // types, as it uses memcpy to copy elements and never calls destructors. -- ASSERT_TRIVIALLY_COPYABLE(T); - static_assert(std::is_trivially_destructible::value); - - public: diff --git a/sums/v22.9.0.sum b/sums/v22.9.0.sum new file mode 100644 index 0000000..0f710d9 --- /dev/null +++ b/sums/v22.9.0.sum @@ -0,0 +1 @@ +296854aa1dca140b0462c2415637d0419e42af91114538a7e6fdf623971a6833