update libexec for pkgx^2

no longer produces `v*`.

Author: jhheider

.github/workflows/ci.actions.yml

@@ -21,9 +21,9 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          path: co  # test that things working isn’t just a coincident of PWD == BREKWIT_DIR
+          path: co # test that things working isn’t just a coincident of PWD == BREKWIT_DIR
 
-      - uses: pkgxdev/setup@v2
+      - uses: pkgxdev/setup@v4
 
       - uses: ./co/build
         id: build
@@ -54,8 +54,8 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          path: co  # test that things working isn’t just a coincident of PWD == BREKWIT_DIR
-      - uses: pkgxdev/setup@v2
+          path: co # test that things working isn’t just a coincident of PWD == BREKWIT_DIR
+      - uses: pkgxdev/setup@v4
       - uses: ./co/download-build-artifact
         with:
           pkg: ${{ needs.build.outputs.pkg }}
@@ -77,8 +77,8 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          path: co  # test that things working isn’t just a coincident of PWD == BREKWIT_DIR
-      - uses: pkgxdev/setup@v2
+          path: co # test that things working isn’t just a coincident of PWD == BREKWIT_DIR
+      - uses: pkgxdev/setup@v4
       - uses: ./co/download-build-artifact
         with:
           pkg: ${{ needs.build.outputs.pkg }}
@@ -100,9 +100,9 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          path: co  # test that things working isn’t just a coincident of PWD == BREKWIT_DIR
+          path: co # test that things working isn’t just a coincident of PWD == BREKWIT_DIR
 
-      - uses: pkgxdev/setup@v2
+      - uses: pkgxdev/setup@v4
 
       - uses: ./co/download-build-artifact
         id: dl
@@ -119,14 +119,14 @@ jobs:
 
       - uses: actions/upload-artifact@v4
         with:
-          path:  ${{ steps.bottle.outputs.filename }}
-          name:  ${{ steps.bottle.outputs.name }}
+          path: ${{ steps.bottle.outputs.filename }}
+          name: ${{ steps.bottle.outputs.name }}
 
   unavailable:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: pkgxdev/setup@v2
+      - uses: pkgxdev/setup@v4
 
       - uses: ./build
         id: build
@@ -148,7 +148,7 @@ jobs:
       pkgs: ${{ steps.id.outputs.pkgs }}
     steps:
       - uses: actions/checkout@v4
-      - uses: pkgxdev/setup@v2
+      - uses: pkgxdev/setup@v4
       - uses: ./id
         id: id
         with:

.github/workflows/ci.cli.yml

@@ -34,7 +34,7 @@ jobs:
     container: ${{ matrix.platform.img }}
     steps:
       - uses: actions/checkout@v4
-      - uses: pkgxdev/setup@v2
+      - uses: pkgxdev/setup@v4
 
       # otherwise, we're getting some weird race conditions on CI
       - run: pkgx --sync
@@ -47,7 +47,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: pkgxdev/setup@v2
+      - uses: pkgxdev/setup@v4
       - uses: ./.github/modify-pantry
       - run: test $(bin/bk status) = stark.com/foo
       - run: bin/bk build
@@ -71,7 +71,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: pkgxdev/setup@v2
+      - uses: pkgxdev/setup@v4
       - run: pkgx --sync # FIXME PKGX_PANTRY_PATH causes auto sync to fail
       - name: build
         run: |

build/build.ts

@@ -189,9 +189,23 @@ function make_toolchain() {
     const d = config.path.home.join('toolchain').rm({ recursive: true }).mkdir('p')
     const prefix = useConfig().prefix
 
-    const llvm = (bin: string) => prefix.join('llvm.org/v*/bin', bin)
-    const gcc = (bin: string) => prefix.join('gnu.org/gcc/v*/bin', bin)
-    const binutils = (bin: string) => prefix.join('gnu.org/binutils/v*/bin', bin)
+    const dep_bin = (project: string, bin: string): Path => {
+      const dep = config.deps.gas.find(x => x.pkg.project === project)
+      if (dep) return dep.path.join('bin', bin)
+      // fallback: resolve from installed versions
+      const dir = prefix.join(project)
+      if (dir.isDirectory()) {
+        const versions = [...Deno.readDirSync(dir.string)]
+          .filter(e => e.isDirectory && e.name.startsWith('v'))
+          .sort((a, b) => a.name.localeCompare(b.name, undefined, { numeric: true }))
+        if (versions.length) return dir.join(versions.at(-1)!.name, 'bin', bin)
+      }
+      throw new Error(`cannot find ${project} installation`)
+    }
+
+    const llvm = (bin: string) => dep_bin('llvm.org', bin)
+    const gcc = (bin: string) => dep_bin('gnu.org/gcc', bin)
+    const binutils = (bin: string) => dep_bin('gnu.org/binutils', bin)
 
     const symlink = (names: string[], target: Path) => {
       for (const name of names) {

libexec/autoconf

@@ -5,7 +5,7 @@ if [ -x /usr/local/bin/pkgx ]; then
   pkgx=/usr/local/bin/pkgx
 else
   # probs this is running in pkgx CI/CD
-  pkgx="${PKGX_DIR:-$HOME/.pkgx}/pkgx.sh/v*/bin/pkgx"
+  pkgx="$(ls -d ${PKGX_DIR:-$HOME/.pkgx}/pkgx.sh/v* | tail -1)/bin/pkgx"
 fi
 
 exec "$pkgx" +gnu.org/autoconf -- autoconf "$@"

libexec/automake

@@ -5,7 +5,7 @@ if [ -x /usr/local/bin/pkgx ]; then
   pkgx=/usr/local/bin/pkgx
 else
   # probs this is running in pkgx CI/CD
-  pkgx="${PKGX_DIR:-$HOME/.pkgx}/pkgx.sh/v*/bin/pkgx"
+  pkgx="$(ls -d ${PKGX_DIR:-$HOME/.pkgx}/pkgx.sh/v* | tail -1)/bin/pkgx"
 fi
 
 exec "$pkgx" +gnu.org/automake -- automake "$@"

libexec/curl

@@ -5,7 +5,7 @@ if [ -x /usr/local/bin/pkgx ]; then
   pkgx=/usr/local/bin/pkgx
 else
   # probs this is running in pkgx CI/CD
-  pkgx="${PKGX_DIR:-$HOME/.pkgx}/pkgx.sh/v*/bin/pkgx"
+  pkgx="$(ls -d ${PKGX_DIR:-$HOME/.pkgx}/pkgx.sh/v* | tail -1)/bin/pkgx"
 fi
 
 exec "$pkgx" +curl.se -- curl "$@"

libexec/git

@@ -5,7 +5,7 @@ if [ -x /usr/local/bin/pkgx ]; then
   pkgx=/usr/local/bin/pkgx
 else
   # probs this is running in pkgx CI/CD
-  pkgx="${PKGX_DIR:-$HOME/.pkgx}/pkgx.sh/v*/bin/pkgx"
+  pkgx="$(ls -d ${PKGX_DIR:-$HOME/.pkgx}/pkgx.sh/v* | tail -1)/bin/pkgx"
 fi
 
 exec "$pkgx" +git-scm.org -- git "$@"

libexec/install

@@ -5,7 +5,7 @@ if [ -x /usr/local/bin/pkgx ]; then
   pkgx=/usr/local/bin/pkgx
 else
   # probs this is running in pkgx CI/CD
-  pkgx="${PKGX_DIR:-$HOME/.pkgx}/pkgx.sh/v*/bin/pkgx"
+  pkgx="$(ls -d ${PKGX_DIR:-$HOME/.pkgx}/pkgx.sh/v* | tail -1)/bin/pkgx"
 fi
 
 exec "$pkgx" +gnu.org/coreutils -- install "$@"

libexec/libtool

@@ -10,7 +10,7 @@ if [ -x /usr/local/bin/pkgx ]; then
   pkgx=/usr/local/bin/pkgx
 else
   # probs this is running in pkgx CI/CD
-  pkgx="${PKGX_DIR:-$HOME/.pkgx}/pkgx.sh/v*/bin/pkgx"
+  pkgx="$(ls -d ${PKGX_DIR:-$HOME/.pkgx}/pkgx.sh/v* | tail -1)/bin/pkgx"
 fi
 
 exec "$pkgx" +gnu.org/libtool -- libtool "$@"

libexec/make

@@ -7,7 +7,7 @@ elif [ -x /usr/local/bin/pkgx ]; then
   pkgx=/usr/local/bin/pkgx
 else
   # probs this is running in pkgx CI/CD
-  pkgx="${PKGX_DIR:-$HOME/.pkgx}/pkgx.sh/v*/bin/pkgx"
+  pkgx="$(ls -d ${PKGX_DIR:-$HOME/.pkgx}/pkgx.sh/v* | tail -1)/bin/pkgx"
 fi
 
 exec "$pkgx" +gnu.org/make -- make "$@"