Skip to content

Commit

Permalink
Fix build
Browse files Browse the repository at this point in the history
  • Loading branch information
PHILO-HE committed Jul 16, 2024
1 parent b024cfc commit 925e8cc
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 5 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 5 additions & 1 deletion CMake/resolve_dependency_modules/hyperscan.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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})
2 changes: 1 addition & 1 deletion scripts/setup-macos.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion velox/functions/lib/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion velox/functions/lib/HyperscanFunctions.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
*/
#include "velox/functions/lib/HyperscanFunctions.h"
#include <errno.h>
#include <hs/hs.h>
#include <limits.h>
#include <stdio.h>
#include <stdlib.h>
#include "hs.h"
#include "velox/functions/lib/string/StringImpl.h"
#include "velox/vector/FunctionVector.h"

Expand Down

0 comments on commit 925e8cc

Please sign in to comment.