From 304389122a4cd579ee832f950c47ebe91e31700c Mon Sep 17 00:00:00 2001 From: Deepak Majeti Date: Thu, 5 Sep 2024 09:45:21 -0400 Subject: [PATCH] Bundle FMT on MacOS --- .github/workflows/macos.yml | 1 + scripts/setup-macos.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 1dcf76575c037..8c53a50317b1d 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -79,6 +79,7 @@ jobs: - name: Configure Build env: folly_SOURCE: BUNDLED #brew folly does not have int128 + fmt_SOURCE: BUNDLED #brew fmt v11 is not supported. run: | ccache -sz -M 5Gi cmake \ diff --git a/scripts/setup-macos.sh b/scripts/setup-macos.sh index 450324e8b19af..d8d071de90495 100755 --- a/scripts/setup-macos.sh +++ b/scripts/setup-macos.sh @@ -35,7 +35,7 @@ PYTHON_VENV=${PYHTON_VENV:-"${SCRIPTDIR}/../.venv"} NPROC=$(getconf _NPROCESSORS_ONLN) DEPENDENCY_DIR=${DEPENDENCY_DIR:-$(pwd)} -MACOS_VELOX_DEPS="bison boost double-conversion flex fmt gflags glog googletest icu4c libevent libsodium lz4 lzo openssl protobuf@21 simdjson snappy thrift xz xsimd zstd" +MACOS_VELOX_DEPS="bison boost double-conversion flex gflags glog googletest icu4c libevent libsodium lz4 lzo openssl protobuf@21 simdjson snappy thrift xz xsimd zstd" MACOS_BUILD_DEPS="ninja cmake ccache" FB_OS_VERSION="v2024.05.20.00" FMT_VERSION="10.1.1"