From 904c51cd54657174368a44e2053dae7d64eb7295 Mon Sep 17 00:00:00 2001 From: Jacob Wujciak-Jens Date: Mon, 29 Jan 2024 12:47:23 -0800 Subject: [PATCH] Upgrade folly to v2023.12.04.00 (from v2022.11.14.00) (#7700) Summary: This version no longer uses deprecated openssl functions. (the actual change is in an earlier version but I think it makes sense to bump as far as possible while we are at it) Pull Request resolved: https://github.com/facebookincubator/velox/pull/7700 Reviewed By: Yuhta Differential Revision: D51966751 Pulled By: kgpai fbshipit-source-id: 33df50e9c6b92459247b7e578a453a2d24e0d6dc --- scripts/setup-macos.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/setup-macos.sh b/scripts/setup-macos.sh index 197ea54e83946..3c617125e1bdd 100755 --- a/scripts/setup-macos.sh +++ b/scripts/setup-macos.sh @@ -95,7 +95,12 @@ function install_fmt { } function install_folly { +<<<<<<< HEAD github_checkout facebook/folly "${FB_OS_VERSION}" +======= + github_checkout facebook/folly "v2023.12.04.00" + OPENSSL_ROOT_DIR=$(brew --prefix openssl@1.1) \ +>>>>>>> b9fb3039c (Upgrade folly to v2023.12.04.00 (from v2022.11.14.00) (#7700)) cmake_install -DBUILD_TESTS=OFF -DFOLLY_HAVE_INT128_T=ON }