From e2bad1aec0a0509a1c0c3996e260d4a1b1bb9d23 Mon Sep 17 00:00:00 2001 From: "Maxim [maxirmx] Samsonov" Date: Mon, 29 Jul 2024 16:00:28 +0300 Subject: [PATCH] fix: folly patch to address https://github.com/tamatebako/tebako/issues/161 --- ci-scripts/patch-folly.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ci-scripts/patch-folly.sh b/ci-scripts/patch-folly.sh index 8d1f1bf..ebfa60f 100755 --- a/ci-scripts/patch-folly.sh +++ b/ci-scripts/patch-folly.sh @@ -195,6 +195,10 @@ EOM sbst="set(OPENSSL_INCLUDE_DIR \"\${OPENSSL_ROOT_DIR}\/include\") # tebako patched" "$GNU_SED" -i "s/$re/$sbst/g" "$1/CMakeLists.txt" + re="auto ep = current_exception();" + subst="auto ep = std::current_exception(); // tebako patched" + do_patch "$1/folly/Executor.cpp" "$re" "$sbst" + elif [[ "$OSTYPE" == "msys"* ]]; then # --- folly/portability/Stdlib.h --- re="#define PATH_MAX _MAX_PATH"