diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 04acb08f8..27b01ed39 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -716,7 +716,7 @@ jobs: submodules: recursive - name: Install dependencies run: | - brew install llvm@12 automake boost libomp wget cmake cryptopp pkg-config grpc zlib openssl lua@5.4 libb64 nlohmann-json luarocks + brew install llvm@15 automake boost libomp wget cmake cryptopp pkg-config grpc zlib openssl lua@5.4 libb64 nlohmann-json luarocks luarocks --lua-dir=$(brew --prefix)/opt/lua@5.4 install lpeg luarocks --lua-dir=$(brew --prefix)/opt/lua@5.4 install dkjson luarocks --lua-dir=$(brew --prefix)/opt/lua@5.4 install luasocket diff --git a/README.md b/README.md index 222670888..33b073f49 100644 --- a/README.md +++ b/README.md @@ -63,7 +63,7 @@ sudo luarocks install --lua-version=5.4 md5 ##### Homebrew ``` -brew install llvm@12 automake boost libomp wget cmake pkg-config grpc zlib openssl cryptopp lua@5.4 libb64 nlohmann-json luarocks +brew install llvm@15 automake boost libomp wget cmake pkg-config grpc zlib openssl cryptopp lua@5.4 libb64 nlohmann-json luarocks luarocks --lua-dir=$(brew --prefix)/opt/lua@5.4 install lpeg luarocks --lua-dir=$(brew --prefix)/opt/lua@5.4 install dkjson luarocks --lua-dir=$(brew --prefix)/opt/lua@5.4 install luasocket diff --git a/src/Makefile b/src/Makefile index 1299f50e3..4059c2f86 100644 --- a/src/Makefile +++ b/src/Makefile @@ -70,8 +70,8 @@ NLOHMANN_JSON_INC_Darwin:=-I/usr/local/opt/nlohmann-json/include B64_LIB_Darwin:=-L/usr/local/opt/libb64/lib -lb64 B64_INC_Darwin:=-I/usr/local/opt/libb64/include GRPC_INC_Darwin=-I/usr/local/opt/gprc/include -GRPC_LIB_Darwin=-L/usr/local/opt/grpc/lib -lgrpc++ -lgrpc -lgpr -lprotobuf -lpthread -labsl_synchronization -PROTOBUF_LIB_Darwin:=-L/usr/local/opt/protobuf/lib -lprotobuf -lpthread +GRPC_LIB_Darwin=-L/usr/local/opt/grpc/lib -lgrpc++ -lgrpc -lgpr -lprotobuf -lpthread -labsl_synchronization -labsl_log_internal_message -labsl_log_internal_check_op -labsl_cord -labsl_status +PROTOBUF_LIB_Darwin:=-L/usr/local/opt/protobuf/lib -lprotobuf -lpthread -labsl_log_internal_message -labsl_log_internal_check_op else # Macports installation BOOST_LIB_DIR_Darwin=-L/opt/local/libexec/boost/1.81/lib BOOST_INC_Darwin=-I/opt/local/libexec/boost/1.81/include