From 00da27137e1b1dd26e1650f6aabf5cbb234f1e1d Mon Sep 17 00:00:00 2001
From: Felipe Santos <felipecassiors@gmail.com>
Date: Wed, 3 Apr 2024 16:18:05 -0300
Subject: [PATCH] Remove llvm.org as deno dependency on darwin+x86-64 (#5765)

* Remove llvm.org as deno dependency on darwin+x86-64

* Do not use llvm.org as darwin+x86-64 build dep

* Remove unuseful tests

* Temporarily use official deno on brewkit actions on darwin

* Try llvm.org inside dependencies block

* Revert "Try llvm.org inside dependencies block"

This reverts commit bcd5ec3a122ff664a340d69e8db0fd79cfd7c241.
---
 .github/workflows/ci.yml       |  8 ++++----
 projects/deno.land/package.yml | 22 +++++++++++-----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 61d7d3a4..269d38e3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -65,12 +65,12 @@ jobs:
         with:
           PKGX_DIR: /opt
 
-      - uses: pkgxdev/brewkit/build@v1
+      - uses: pkgxdev/brewkit/build@8af9fe5a1c1ccd2c7aa9210bf42f4b02f04b64e4 # TODO: revert to v1
         id: build
         with:
           pkg: ${{ matrix.pkg }}
 
-      - uses: pkgxdev/brewkit/audit@v1
+      - uses: pkgxdev/brewkit/audit@8af9fe5a1c1ccd2c7aa9210bf42f4b02f04b64e4 # TODO: revert to v1
         with:
           pkg: ${{ steps.build.outputs.pkgspec }}
 
@@ -82,7 +82,7 @@ jobs:
             SUDO=sudo
           fi
           $SUDO rm -rf builds
-
-      - uses: pkgxdev/brewkit/test@v1
+        
+      - uses: pkgxdev/brewkit/test@8af9fe5a1c1ccd2c7aa9210bf42f4b02f04b64e4 # TODO: revert to v1
         with:
           pkg: ${{ steps.build.outputs.pkgspec }}
diff --git a/projects/deno.land/package.yml b/projects/deno.land/package.yml
index b6d8132e..d84d88eb 100644
--- a/projects/deno.land/package.yml
+++ b/projects/deno.land/package.yml
@@ -18,13 +18,18 @@ runtime:
     DENO_NO_UPDATE_CHECK: 'true'
     DENORT_BIN: '{{prefix}}/bin/denort'
 
-dependencies:
-  darwin/x86-64:
-    # FIXME try removing this after new builds are available
-    llvm.org: 17 # libunwind
-
 build:
   script:
+    # deno does not need llvm to build on darwin+x86-64, and if it is present,
+    # deno will be linked to its libunwind, which then causes deno to need llvm
+    # in runtime.
+    - |
+      if test "{{hw.platform}}+{{ hw.arch }}" != "darwin+x86-64"; then
+        set -o allexport
+        source <(pkgx +llvm.org^17)
+        set +o allexport
+      fi
+
     - |
       rust_version=$(yq -er .toolchain.channel rust-toolchain.toml)
       if semverator lt "$rust_version" 1.67.0; then
@@ -34,7 +39,7 @@ build:
         rust_version=1.67.0
       fi
       set -o allexport
-      source <(pkgx "+rust-lang.org~${rust_version}" +rust-lang.org/cargo^0 +llvm.org^17)
+      source <(pkgx "+rust-lang.org~${rust_version}" +rust-lang.org/cargo^0)
       set +o allexport
       unset rust_version
 
@@ -78,10 +83,5 @@ test:
       if: '>=1.40.5'  
     # tests download of dependencies
     - deno eval 'import { VERSION } from "https://deno.land/std@0.221.0/version.ts"; console.log(VERSION);' | tee /dev/stderr | grep -q ^0.221.0$
-    # ensures deno is not linked to libunwind
-    - run: otool -l {{prefix}}/bin/deno | grep -v libunwind
-      if: darwin
-    - run: ldd {{prefix}}/bin/deno | grep -v libunwind
-      if: linux
   fixture: |
     console.log("Hello, world!");