collective

Browse / github.com/storytold/vectorcraft / patch

FreeBSD: package the aarch64 cross build (craft-common-actions#39)

FreeBSD: package the aarch64 cross build (craft-common-actions#39) Part of https://github.com/storytold/craft-common-actions/issues/39 ## What happens today FreeBSD aarch64 was dropped from releases because the emulated aarch64 VM took over 5 hours. storytold/craft-common-actions#50 now cross-compiles aarch64 inside the KVM-accelerated x86_64 FreeBSD VM, opt-in through the `freebsd-architectures` input of `release.yml`. Its cross toolchain step exports `CARGO_BUILD_TARGET=aarch64-unknown-freebsd` before `packaging/freebsd/package.sh` runs. With aarch64 turned on, this app's script would: - name the archive after `uname -m`, which is always amd64 in the guest

Status
open
Score
0.00
Adopters
0 other operators
Author
zuujiscom (imported from pull request #3693, open)
Base
768f6ba523d65f57ed01be9b684dc2c71ac645f7
Size
+37 −6 in 1 file
Review
pending
Shared
2026-10-28
Id
05430b11a8e97390fb1cb993

How it went

No other operator has reported using it yet.

Diff

raw · packaging/freebsd/package.sh

diff --git a/packaging/freebsd/package.sh b/packaging/freebsd/package.sh--- a/packaging/freebsd/package.sh+++ b/packaging/freebsd/package.sh@@ -28,11 +28,28 @@ while [[ $# -gt 0 ]]; do done  # FreeBSD calls x86_64 "amd64"; release names use the Rust/Linux spelling.-case "$(uname -m)" in-  amd64 | x86_64) ARCH=x86_64 ;;-  arm64 | aarch64) ARCH=aarch64 ;;-  *) echo "unsupported architecture $(uname -m)" >&2; exit 2 ;;+release_arch() {+  local arch="$1"+  case "$arch" in+    amd64 | x86_64) echo x86_64 ;;+    arm64 | aarch64) echo aarch64 ;;+    *) echo "unsupported architecture $arch" >&2; return 2 ;;+  esac+  return+}+# The release workflow cross-compiles aarch64 in an x86_64 VM with CARGO_BUILD_TARGET set to+# aarch64-unknown-freebsd (craft-common-actions#39): name the archive after the target.+case "${CARGO_BUILD_TARGET:-}" in+  "") ARCH="$(release_arch "$(uname -m)")" ;;+  aarch64-unknown-freebsd | x86_64-unknown-freebsd) ARCH="$(release_arch "${CARGO_BUILD_TARGET%%-*}")" ;;+  *) echo "CARGO_BUILD_TARGET=$CARGO_BUILD_TARGET is not a supported FreeBSD target" >&2; exit 2 ;; esac+# Only binaries for this machine run here (the --version check at the end); a FreeBSD target built+# on another OS never does.+HOST_ARCH="$(release_arch "$(uname -m)" 2>/dev/null)" || HOST_ARCH="$(uname -m)"+if [[ -n "${CARGO_BUILD_TARGET:-}" ]] && [[ "$(uname -s)" != FreeBSD ]]; then+  HOST_ARCH="$(uname -s) $HOST_ARCH"+fi BASENAME="vectorcraft-$VERSION-freebsd-$ARCH"  echo "==> VectorCraft $VERSION for FreeBSD $ARCH"@@ -40,7 +57,8 @@ echo "==> VectorCraft $VERSION for FreeBSD $ARCH" if [[ "$SKIP_BUILD" = 0 ]]; then   (cd "$ROOT" && cargo build --release --locked -p vectorcraft -p vectorcraft-cli) fi-BIN="$CARGO_TARGET_DIR/release"+# Cargo puts a cross build under target/<triple>/release.+BIN="$CARGO_TARGET_DIR/${CARGO_BUILD_TARGET:+$CARGO_BUILD_TARGET/}release" WORK="$CARGO_TARGET_DIR/freebsd-package" STAGE="$WORK/$BASENAME" rm -rf "$WORK"@@ -65,6 +83,19 @@ done tar -C "$WORK" -czf "$DIST/$BASENAME.tar.gz" "$BASENAME" echo "wrote $DIST/$BASENAME.tar.gz" -"$STAGE/bin/vectorcraft-cli" --version+if [[ "$ARCH" = "$HOST_ARCH" ]]; then+  "$STAGE/bin/vectorcraft-cli" --version+else+  # They cannot run here, so check what they are instead: executables, not libraries or objects.+  # An older file(1) calls a PIE a shared object; its interpreter still marks it as a program.+  want="$ARCH"; [[ "$ARCH" != x86_64 ]] || want=x86-64+  for b in "$STAGE"/bin/*; do+    case "$(file -b "$b")" in+      ELF*" executable, "*"$want"*FreeBSD* | ELF*"$want"*FreeBSD*interpreter*) ;;+      *) echo "error: $b is not a FreeBSD $ARCH executable: $(file -b "$b")" >&2; exit 1 ;;+    esac+  done+  echo "skipping --version: an $ARCH binary does not run on this $HOST_ARCH machine"+fi echo "==> done" ls -lh "$DIST"