From cf391f70588c23048fa50687c2e7f8bd9414569f Mon Sep 17 00:00:00 2001 From: Matthew LeVan Date: Wed, 15 Nov 2023 12:22:31 -0500 Subject: [PATCH] build: update `urcrypt` to fix `-march=native` usage in `keccak` compilation --- .github/workflows/shared.yml | 6 ++++-- INSTALL.md | 2 +- WORKSPACE.bazel | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/shared.yml b/.github/workflows/shared.yml index d2f4959d0c..aee47884a5 100644 --- a/.github/workflows/shared.yml +++ b/.github/workflows/shared.yml @@ -113,18 +113,20 @@ jobs: run: | case "${{ matrix.target }}" in "linux-aarch64") + sudo apt-get -y install autoconf-archive bazel run //bazel/toolchain:aarch64-linux-musl-gcc ;; "linux-x86_64") + sudo apt-get -y install autoconf-archive bazel run //bazel/toolchain:x86_64-linux-musl-gcc ;; "macos-aarch64") - brew install pkg-config + brew install pkg-config autoconf-archive ;; "macos-x86_64") # Switch Xcode path to match the path specified in our bazel toolchain. sudo xcode-select --switch /Library/Developer/CommandLineTools - brew install automake libtool llvm@15 + brew install automake autoconf-archive libtool llvm@15 ;; *) echo "Unsupported target: ${{ matrix.target }}" diff --git a/INSTALL.md b/INSTALL.md index e30f14f88e..40f7b6f693 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -50,7 +50,7 @@ This will take a few minutes. ### macOS -After installing `automake` and `libtool`, you're ready to build Vere. +After installing `automake`, `autoconf-archive`, and `libtool`, you're ready to build Vere. ## Build Commands diff --git a/WORKSPACE.bazel b/WORKSPACE.bazel index c5a66ad095..cec372d590 100644 --- a/WORKSPACE.bazel +++ b/WORKSPACE.bazel @@ -299,10 +299,10 @@ versioned_http_file( versioned_http_archive( name = "urcrypt", build_file = "//bazel/third_party/urcrypt:urcrypt.BUILD", - sha256 = "00ec597c14c418802d5db2d6a68cf83bd4f5419071b95f979374d3184599d6c8", + sha256 = "afc1182e10eeebaeb2a111c2bd889747792d255e26aba7fdcd6751d0d3c2bb35", strip_prefix = "urcrypt-{version}", url = "https://github.com/urbit/urcrypt/archive/{version}.tar.gz", - version = "b970baefa6e0a680fffa2b2ee19c956a4ae20355", + version = "43479c3262a11e20da5f6218f3b0b3d63931ceea", ) versioned_http_archive(