From 7454e43a88236fa35ea99791ab791e73598c3949 Mon Sep 17 00:00:00 2001 From: Jacob Heider Date: Tue, 2 Jan 2024 10:33:59 -0500 Subject: [PATCH] fix(folly) closes #4680 --- projects/facebook.com/folly/package.yml | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/projects/facebook.com/folly/package.yml b/projects/facebook.com/folly/package.yml index e6790276..d0134856 100644 --- a/projects/facebook.com/folly/package.yml +++ b/projects/facebook.com/folly/package.yml @@ -17,6 +17,7 @@ dependencies: gnu.org/coreutils: 9 google.github.io/snappy: '*' google.com/double-conversion: ^3 + google.com/googletest: ^1 fmt.dev: ^9 zlib.net: ^1 darwin: @@ -27,19 +28,6 @@ build: cmake.org: ^3.0.2 freedesktop.org/pkg-config: ^0.29 script: - # folly uses the path to build as part of a regex, but out paths have "+"s in them. - # don't mess up the intentional newline - - run: | - sed -i.bak -E -f $PROP CMakeLists.txt - rm CMakeLists.txt.bak - prop: | - /^REMOVE_MATCHES_FROM_LISTS\(files hfiles/ { - i\\ - string(REPLACE "+" "\\\\\\\\+" ESCAPED_FOLLY_DIR "\${FOLLY_DIR}") - } - - s/\^\$\{FOLLY_DIR\}/^\$\{ESCAPED_FOLLY_DIR\}/g - - cmake $ARGS -DBUILD_SHARED_LIBS=ON -S . -B shared - cmake --build shared - cmake --install shared