diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6ecb1fe..0cefb40 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,7 +35,6 @@ jobs: src/Rack/dep/jansson-2.12 src/Rack/dep/libarchive-3.4.3 src/Rack/dep/libsamplerate-0.1.9 - src/Rack/dep/speexdsp-SpeexDSP-1.2rc3 src/Rack/dep/zstd-1.4.5 key: linux-${{ matrix.target }}-v${{ env.CACHE_VERSION }} - name: Fix GitHub's mess @@ -191,9 +190,11 @@ jobs: src/Rack/dep/jansson-2.12 src/Rack/dep/libarchive-3.4.3 src/Rack/dep/libsamplerate-0.1.9 - src/Rack/dep/speexdsp-SpeexDSP-1.2rc3 src/Rack/dep/zstd-1.4.5 key: macos-${{ matrix.target }}-v${{ env.CACHE_VERSION }} + - name: Setup dependencies + run: | + brew install autoconf - name: Build extra dependencies run: | export PATH="/usr/local/opt/ccache/libexec:${PATH}" @@ -325,7 +326,6 @@ jobs: src/Rack/dep/jansson-2.12 src/Rack/dep/libarchive-3.4.3 src/Rack/dep/libsamplerate-0.1.9 - src/Rack/dep/speexdsp-SpeexDSP-1.2rc3 src/Rack/dep/zstd-1.4.5 key: wasm-${{ matrix.target }}-v${{ env.CACHE_VERSION }} - name: Set up dependencies @@ -421,7 +421,6 @@ jobs: src/Rack/dep/jansson-2.12 src/Rack/dep/libarchive-3.4.3 src/Rack/dep/libsamplerate-0.1.9 - src/Rack/dep/speexdsp-SpeexDSP-1.2rc3 src/Rack/dep/zstd-1.4.5 key: ${{ matrix.target }}-v${{ env.CACHE_VERSION }} - name: Fix GitHub's mess @@ -606,7 +605,6 @@ jobs: src/Rack/dep/jansson-2.12 src/Rack/dep/libarchive-3.4.3 src/Rack/dep/libsamplerate-0.1.9 - src/Rack/dep/speexdsp-SpeexDSP-1.2rc3 src/Rack/dep/zstd-1.4.5 key: pluginval-v${{ env.CACHE_VERSION }} - name: Set up dependencies diff --git a/deps/Makefile b/deps/Makefile index 68ba1e2..5bfb6a6 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -12,15 +12,16 @@ include $(ROOT)/Makefile.base.mk ifeq ($(CPU_ARM32),true) ARCH_NAME = arm -MACHINE = i686-the-rack +MACHINE = arm64 else ifeq ($(CPU_ARM64),true) ARCH_NAME = arm64 -MACHINE = x86_64-the-rack +MACHINE = arm64 else ifeq ($(CPU_RISCV64),true) ARCH_NAME = riscv64 -MACHINE = x86_64-the-rack +MACHINE = arm64 else ifeq ($(WASM),true) -MACHINE = i686-wasm +ARCH_NAME = wasm +MACHINE = x86_64 else MACHINE = $(TARGET_MACHINE) endif