diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index ee2d15829c45..b5f074ea3d52 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -64,7 +64,8 @@ jobs: brew install \ bison boost ccache double-conversion flex fmt gflags glog \ icu4c libevent libsodium lz4 lzo ninja openssl protobuf@21 \ - range-v3 simdjson snappy thrift xz xsimd zstd + range-v3 simdjson snappy thrift xz xsimd zstd libtool automake \ + autoconf echo "NJOBS=`sysctl -n hw.ncpu`" >> $GITHUB_ENV brew unlink protobuf || echo "protobuf not installed" diff --git a/CMake/resolve_dependency_modules/hyperscan.cmake b/CMake/resolve_dependency_modules/hyperscan.cmake index 3c33ab78f21e..578a6c386dbc 100644 --- a/CMake/resolve_dependency_modules/hyperscan.cmake +++ b/CMake/resolve_dependency_modules/hyperscan.cmake @@ -27,7 +27,9 @@ if(${RAGEL} STREQUAL "RAGEL-NOTFOUND") FetchContent_Populate(colm) endif() execute_process( - COMMAND bash -c "./autogen.sh && ./configure && make && make install" + COMMAND + bash -c + "./autogen.sh && ./configure --prefix=/usr/local/ && make && make install" WORKING_DIRECTORY ${colm_SOURCE_DIR} RESULT_VARIABLE result OUTPUT_VARIABLE output @@ -82,4 +84,6 @@ set(CMAKE_CXX_STANDARD 11) set(BUILD_EXAMPLES FALSE) set(BUILD_AVX512 ON) FetchContent_MakeAvailable(hyperscan) +set_target_properties(hs PROPERTIES INTERFACE_INCLUDE_DIRECTORIES + ${hyperscan_SOURCE_DIR}/src) set(CMAKE_CXX_STANDARD ${CMAKE_CXX_STANDARD_BACKUP}) diff --git a/scripts/setup-macos.sh b/scripts/setup-macos.sh index 72ee5f189bf9..41a444922a2c 100755 --- a/scripts/setup-macos.sh +++ b/scripts/setup-macos.sh @@ -34,7 +34,7 @@ source $SCRIPTDIR/setup-helper-functions.sh NPROC=$(getconf _NPROCESSORS_ONLN) DEPENDENCY_DIR=${DEPENDENCY_DIR:-$(pwd)} -MACOS_VELOX_DEPS="flex bison protobuf@21 icu4c boost gflags glog libevent lz4 lzo snappy xz zstd openssl libsodium libtool" +MACOS_VELOX_DEPS="flex bison protobuf@21 icu4c boost gflags glog libevent lz4 lzo snappy xz zstd openssl libsodium libtool automake autoconf" MACOS_BUILD_DEPS="ninja cmake ccache" FB_OS_VERSION="v2024.05.20.00" diff --git a/velox/functions/lib/CMakeLists.txt b/velox/functions/lib/CMakeLists.txt index e1a65959222f..4515e05067b9 100644 --- a/velox/functions/lib/CMakeLists.txt +++ b/velox/functions/lib/CMakeLists.txt @@ -40,7 +40,7 @@ add_library( TimeUtils.cpp) target_link_libraries(velox_functions_lib velox_functions_util velox_vector - re2::re2 Folly::folly hyperscan) + re2::re2 Folly::folly hs) add_subdirectory(aggregates) add_subdirectory(string) diff --git a/velox/functions/lib/HyperscanFunctions.cpp b/velox/functions/lib/HyperscanFunctions.cpp index 59182eb1dd48..2618e437321b 100644 --- a/velox/functions/lib/HyperscanFunctions.cpp +++ b/velox/functions/lib/HyperscanFunctions.cpp @@ -15,10 +15,10 @@ */ #include "velox/functions/lib/HyperscanFunctions.h" #include -#include #include #include #include +#include "hs.h" #include "velox/functions/lib/string/StringImpl.h" #include "velox/vector/FunctionVector.h"