Skip to content

Commit a77a05b

Browse files
authored
deno: bump to 2.7.3 (#28816)
1 parent bf57d19 commit a77a05b

6 files changed

Lines changed: 32 additions & 34 deletions

packages/deno/0005-use-libz-sys-default-features.patch

Lines changed: 0 additions & 13 deletions
This file was deleted.

packages/deno/0008-do-not-use-compile-time-platform-str.patch renamed to packages/deno/0006-do-not-use-compile-time-platform-str.patch

File renamed without changes.

packages/deno/0006-dont-enable-libsqlite3-sys-bundled-feature.patch

Lines changed: 0 additions & 13 deletions
This file was deleted.

packages/deno/build.sh

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://deno.land/
22
TERMUX_PKG_DESCRIPTION="A modern runtime for JavaScript and TypeScript"
33
TERMUX_PKG_LICENSE="MIT"
44
TERMUX_PKG_MAINTAINER="@licy183"
5-
TERMUX_PKG_VERSION="1:2.7.1"
5+
TERMUX_PKG_VERSION="1:2.7.3"
66
TERMUX_PKG_SRCURL=https://github.com/denoland/deno/releases/download/v${TERMUX_PKG_VERSION:2}/deno_src.tar.gz
7-
TERMUX_PKG_SHA256=8798387a8e93958b453191de1aaa01e82ad376432fa97a01b3bd483f4b7f4308
7+
TERMUX_PKG_SHA256=61165551a143b3cff166e5b5da85a4463d961eb655ffcfc35afecea20cca3ad5
88
TERMUX_PKG_DEPENDS="libandroid-stub, libffi, libsqlite, zlib"
99
TERMUX_PKG_BUILD_DEPENDS="aosp-libs"
1010
TERMUX_PKG_BUILD_IN_SRC=true
@@ -24,6 +24,14 @@ termux_step_get_source() {
2424
tar xf "$file" -C "$TERMUX_PKG_SRCDIR" --strip-components=1
2525
}
2626

27+
termux_step_post_get_source() {
28+
# Use default-features in `libz-sys`
29+
sed -i '/^libz-sys *=/ s/, *default-features *= *false//' Cargo.toml
30+
31+
# Remove "bundled" feature in `rusqlite`
32+
sed -i '/^rusqlite.*features/ s/"bundled", \?//' Cargo.toml
33+
}
34+
2735
termux_step_pre_configure() {
2836
# Backup source of deno_snapshots
2937
mv "$TERMUX_PKG_SRCDIR"/cli/snapshot "$TERMUX_PKG_TMPDIR"/snapshot.orig
@@ -208,8 +216,10 @@ termux_step_make() {
208216
fi
209217

210218
local _release_opt="--release"
219+
local _folder="release"
211220
if [ "$TERMUX_DEBUG_BUILD" = "true" ]; then
212221
_release_opt=
222+
_folder="debug"
213223
fi
214224

215225
# Prepare source to build cli snapshot generator
@@ -234,7 +244,7 @@ termux_step_make() {
234244
termux_setup_proot
235245
termux-proot-run env LD_PRELOAD= LD_LIBRARY_PATH= \
236246
OUT_DIR="$_deno_prebuilt_snapshot_dir" TARGET="$CARGO_TARGET_NAME" \
237-
"$TERMUX_PKG_SRCDIR"/target/$CARGO_TARGET_NAME/release/deno_snapshots
247+
"$TERMUX_PKG_SRCDIR"/target/$CARGO_TARGET_NAME/$_folder/deno_snapshots
238248

239249
# Recover source
240250
rm -rf "$TERMUX_PKG_SRCDIR"/cli/snapshot/*

packages/deno/v8-patches/0103-reland-jumbo-for-v8.patch

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ index 047283a2..58ce611c 100644
6363
import("//build/config/mips.gni")
6464
import("//build/config/riscv.gni")
6565
import("//build/config/rust.gni")
66-
@@ -3142,26 +3143,54 @@
66+
@@ -3295,26 +3296,55 @@
6767
}
6868
}
6969

@@ -81,6 +81,7 @@ index 047283a2..58ce611c 100644
8181
+ "src/ic/binary-op-assembler.cc",
8282
+ "src/ic/unary-op-assembler.cc",
8383
+ "src/interpreter/interpreter-generator.cc",
84+
+ "src/compiler/turboshaft/builtin-compiler.cc",
8485
+ ]
8586
+
8687
if (v8_current_cpu == "x86") {
@@ -918,24 +919,27 @@ index fd558992..190e9ee0 100644
918919
namespace v8 {
919920
namespace internal {
920921

921-
@@ -2110,3 +2112,5 @@ RegExpNode* RegExpQuantifier::ToNode(int min, int max, bool is_greedy,
922+
@@ -2326,3 +2328,8 @@ RegExpNode* RegExpQuantifier::ToNode(int min, int max, bool is_greedy,
922923

923924
} // namespace internal
924925
} // namespace v8
925926
+
927+
+#undef TRACE
928+
+#undef TRACE_WITH_NODE
929+
+#undef REGISTER_NODE
926930
+#undef kMaxCodePoint
927931
diff --git a/v8/src/sandbox/testing.cc b/v8/src/sandbox/testing.cc
928932
index 52d73951..d96f56f4 100644
929933
--- a/v8/src/sandbox/testing.cc
930934
+++ b/v8/src/sandbox/testing.cc
931-
@@ -20,6 +20,7 @@
935+
@@ -29,6 +29,7 @@
932936
#include <sys/mman.h>
933937
#include <sys/ucontext.h>
934938
#include <unistd.h>
935939
+#undef MAP_TYPE
936-
#endif // V8_OS_LINUX
937940

938-
#ifdef V8_USE_ADDRESS_SANITIZER
941+
#include "src/base/platform/platform-linux.h"
942+
#endif // V8_OS_LINUX
939943
diff --git a/v8/src/snapshot/read-only-deserializer.cc b/v8/src/snapshot/read-only-deserializer.cc
940944
index 24e770f1..3568071a 100644
941945
--- a/v8/src/snapshot/read-only-deserializer.cc
@@ -1070,3 +1074,13 @@ index 2be79a9d..faa205ef 100644
10701074
} // namespace v8::internal::compiler::turboshaft
10711075
+
10721076
+#undef TRACE
1077+
--- a/v8/src/regexp/regexp-compiler.cc
1078+
+++ b/v8/src/regexp/regexp-compiler.cc
1079+
@@ -4106,3 +4106,7 @@
1080+
#endif
1081+
1082+
} // namespace v8::internal
1083+
+
1084+
+#undef TRACE
1085+
+#undef TRACE_WITH_NODE
1086+
+#undef REGISTER_NODE

0 commit comments

Comments
 (0)