From 6e3c96625ad4be3e4760df74584f69b5768115a9 Mon Sep 17 00:00:00 2001
From: Jacob Heider <jacob@pkgx.dev>
Date: Wed, 3 Apr 2024 15:32:39 -0400
Subject: [PATCH] 2nd try: remove llvm/libunwind from deno

---
 .github/workflows/ci.yml           |  8 ++++----
 .github/workflows/pkg-platform.yml | 14 +++++++-------
 projects/deno.land/package.yml     | 22 +++++++++++-----------
 3 files changed, 22 insertions(+), 22 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/.github/workflows/pkg-platform.yml b/.github/workflows/pkg-platform.yml
index f46f8bf0..b5708f55 100644
--- a/.github/workflows/pkg-platform.yml
+++ b/.github/workflows/pkg-platform.yml
@@ -80,7 +80,7 @@ jobs:
           p12-password: ${{ secrets.APPLE_CERTIFICATE_P12_PASSWORD }}
           APPLE_IDENTITY: ${{ secrets.APPLE_IDENTITY }}
 
-      - uses: pkgxdev/brewkit/build@v1
+      - uses: pkgxdev/brewkit/build@8af9fe5a1c1ccd2c7aa9210bf42f4b02f04b64e4 # TODO: revert to v1
         with:
           pkg: ${{ inputs.pkg }}
         id: build
@@ -88,11 +88,11 @@ jobs:
       - uses: styfle/cancel-workflow-action@0.12.0
         if: steps.build.outputs.noop
 
-      - uses: pkgxdev/brewkit/audit@v1
+      - uses: pkgxdev/brewkit/audit@8af9fe5a1c1ccd2c7aa9210bf42f4b02f04b64e4 # TODO: revert to v1
         with:
           pkg: ${{ inputs.pkg }}
 
-      - uses: pkgxdev/brewkit/upload-build-artifact@v1
+      - uses: pkgxdev/brewkit/upload-build-artifact@8af9fe5a1c1ccd2c7aa9210bf42f4b02f04b64e4 # TODO: revert to v1
 
   test:
     name: test ${{inputs.tinyname}} ${{ matrix.container || ''}} ${{ matrix.container || '' }} ${{ join(matrix.os, '+') }}
@@ -109,10 +109,10 @@ jobs:
     steps:
       - uses: pkgxdev/setup@v2
       - uses: actions/checkout@v4
-      - uses: pkgxdev/brewkit/download-build-artifact@v1
+      - uses: pkgxdev/brewkit/download-build-artifact@8af9fe5a1c1ccd2c7aa9210bf42f4b02f04b64e4 # TODO: revert to v1
         with:
           pkg: ${{ inputs.pkg }}
-      - uses: pkgxdev/brewkit/test@v1
+      - uses: pkgxdev/brewkit/test@8af9fe5a1c1ccd2c7aa9210bf42f4b02f04b64e4 # TODO: revert to v1
         with:
           pkg: ${{ inputs.pkg }}
 
@@ -143,14 +143,14 @@ jobs:
         env:
           GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
 
-      - uses: pkgxdev/brewkit/download-build-artifact@v1
+      - uses: pkgxdev/brewkit/download-build-artifact@8af9fe5a1c1ccd2c7aa9210bf42f4b02f04b64e4 # TODO: revert to v1
         id: dl
         with:
           pkg: ${{ inputs.pkg }}
           platform: ${{ inputs.name }}
           extract: false
 
-      - uses: pkgxdev/brewkit/bottle@v1
+      - uses: pkgxdev/brewkit/bottle@8af9fe5a1c1ccd2c7aa9210bf42f4b02f04b64e4 # TODO: revert to v1
         id: bottle
         with:
           file: ${{ steps.dl.outputs.filename }}
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!");