Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Re-enable Linux ARM #143

Closed
wants to merge 25 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
add disable-snapshot patch
mdekstrand committed Nov 6, 2024
commit fcacab7075b32a7eb5e059881bf93bb392d49faf
4 changes: 2 additions & 2 deletions recipe/01-fix-libffi-msvc.patch
Original file line number Diff line number Diff line change
@@ -8,10 +8,10 @@ From: Michael Ekstrand <md@ekstrandom.net>
1 file changed, 3 insertions(+)

diff --git a/Cargo.toml b/Cargo.toml
index d811d44b5..4d6c61e32 100644
index 13140b65d..061caff44 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -228,6 +228,9 @@ winapi = "=0.3.9"
@@ -229,6 +229,9 @@ winapi = "=0.3.9"
windows-sys = { version = "0.52.0", features = ["Win32_Foundation", "Win32_Media", "Win32_Storage_FileSystem", "Win32_System_IO", "Win32_System_WindowsProgramming", "Wdk", "Wdk_System", "Wdk_System_SystemInformation", "Win32_Security", "Win32_System_Pipes", "Wdk_Storage_FileSystem", "Win32_System_Registry", "Win32_System_Kernel"] }
winres = "=0.1.12"

42 changes: 42 additions & 0 deletions recipe/02-disable-snapshotting.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
disable snapshotting

From: Michael Ekstrand <mdekstrand@drexel.edu>


---
cli/Cargo.toml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index 32229d816..e4ecfeaab 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -54,8 +54,8 @@ hmr = ["deno_runtime/hmr"]
__vendored_zlib_ng = ["flate2/zlib-ng-compat", "libz-sys/zlib-ng"]

[build-dependencies]
-deno_runtime = { workspace = true, features = ["include_js_files_for_snapshotting", "only_snapshotted_js_sources"] }
-deno_core = { workspace = true, features = ["include_js_files_for_snapshotting"] }
+deno_runtime = { workspace = true }
+deno_core = { workspace = true }
lazy-regex.workspace = true
serde.workspace = true
serde_json.workspace = true
@@ -71,7 +71,7 @@ winres.workspace = true
deno_ast = { workspace = true, features = ["bundler", "cjs", "codegen", "proposal", "react", "sourcemap", "transforms", "typescript", "view", "visit"] }
deno_cache_dir = { workspace = true }
deno_config = { version = "=0.38.2", features = ["workspace", "sync"] }
-deno_core = { workspace = true, features = ["include_js_files_for_snapshotting"] }
+deno_core = { workspace = true }
deno_doc = { version = "0.156.0", default-features = false, features = ["rust", "html", "syntect"] }
deno_graph = { version = "=0.84.1" }
deno_lint = { version = "=0.68.0", features = ["docs"] }
@@ -80,7 +80,7 @@ deno_npm.workspace = true
deno_package_json.workspace = true
deno_path_util.workspace = true
deno_resolver.workspace = true
-deno_runtime = { workspace = true, features = ["include_js_files_for_snapshotting"] }
+deno_runtime = { workspace = true }
deno_semver.workspace = true
deno_task_shell = "=0.18.1"
deno_terminal.workspace = true
6 changes: 2 additions & 4 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -7,14 +7,12 @@ package:
source:
- url: https://github.com/denoland/deno/releases/download/v{{ version }}/deno_src.tar.gz
sha256: a9a8f410d46768e9b6d803f1aaeb00ed8cd8496eebea40528a97d93ab8deb0d1
patches: # [win]
patches:
- 01-fix-libffi-msvc.patch # [win]
- 02-disable-snapshot.patch # [linux and aarch64]
- url: https://github.com/denoland/deno/releases/download/v{{ version }}/deno-aarch64-apple-darwin.zip # [osx and arm64]
sha256: e2a7e6e1baa4e2724a5527211b10d50df18130ec20d89d999c6474e2a017264a # [osx and arm64]
folder: target/prebuilt # [osx and arm64]
- url: https://github.com/denoland/deno/releases/download/v{{ version }}/deno-aarch64-unknown-linux-gnu.zip # [linux and aarch64]
sha256: 0ccd4a98f70f5c47a592144a5b8d6a4a2ad3ced9cb9e3dffeb6ed35130878b93 # [linux and aarch64]
folder: target/prebuilt # [linux and aarch64]

build:
number: 1
3 changes: 2 additions & 1 deletion recipe/series
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
# This series applies on Git commit a62c7e036ab6851c0293f407ead635a7331445b7
# This series applies on GIT commit 78a799b4947461eb5c6092295cbcdabfe94053f7
01-fix-libffi-msvc.patch
02-disable-snapshotting.patch