Merge pull request #138 from mdekstrand/2.0

Bump to Deno 2.0
conda-forge · Oct 23, 2024 · bae1610 · bae1610
2 parents 7e35651 + ae5c541
commit bae1610
Show file tree

Hide file tree

Showing 16 changed files with 124 additions and 120 deletions.
diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml
diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml
diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml
diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml
@@ -1,7 +1,7 @@
 c_compiler:
-- gcc
+- clang
 c_compiler_version:
-- '13'
+- '18'
 c_stdlib:
 - sysroot
 c_stdlib_version:

diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml
diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh
diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat
diff --git a/README.md b/README.md
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
diff --git a/conda-forge.yml b/conda-forge.yml
@@ -5,7 +5,7 @@ azure:
       MINIFORGE_HOME: C:\Miniforge
       SET_PAGEFILE: "True"
 build_platform:
-  linux_aarch64: linux_64
+  # linux_aarch64: linux_64
   osx_arm64: osx_64
 conda_build:
   pkg_format: '2'

diff --git a/recipe/01-fix-libffi-msvc.patch b/recipe/01-fix-libffi-msvc.patch
@@ -8,16 +8,16 @@ From: Michael Ekstrand <md@ekstrandom.net>
  1 file changed, 3 insertions(+)
 
 diff --git a/Cargo.toml b/Cargo.toml
-index 84c117bc5..cb7318162 100644
+index d811d44b5..4d6c61e32 100644
 --- a/Cargo.toml
 +++ b/Cargo.toml
-@@ -187,6 +187,9 @@ winres = "=0.1.12"
- winapi = "=0.3.9"
- windows-sys = { version = "0.48.0", features = ["Win32_Media"] }
+@@ -228,6 +228,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"
 
 +[patch.crates-io]
 +libffi-sys = { git = "https://github.com/tov/libffi-rs", branch = "master" }
 +
- # NB: the `bench` and `release` profiles must remain EXACTLY the same.
  [profile.release]
  codegen-units = 1
+ incremental = true
diff --git a/recipe/build.sh b/recipe/build.sh
@@ -41,7 +41,7 @@ else
         CARGO=cargo
     fi
     echo "$CARGO build --release $build_args" >&2
-    $CARGO build --release $build_args
+    $CARGO build --release -v $build_args
 
     mkdir -p $PREFIX/bin
     OUTPUT_EXE=$(find target -name deno | tail -n 1)

diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml
@@ -1,7 +1,11 @@
-c_stdlib_version:          # [osx]
-  - "11.0"                 # [osx]
-MACOSX_SDK_VERSION:        # [osx]
-  - "11.3"                 # [osx and arm64]
-  - "11.0"                 # [osx and x86_64]
+c_compiler:                 # [linux]
+  - clang                   # [linux]
+c_compiler_version:         # [linux]
+  - 18                      # [linux]
+c_stdlib_version:           # [osx]
+  - "11.0"                  # [osx]
+MACOSX_SDK_VERSION:         # [osx]
+  - "11.3"                  # [osx and arm64]
+  - "11.0"                  # [osx and x86_64]
 rust_compiler_version:
-  - 1.80.1
+  - 1.80.1