Skip to content

Commit

Permalink
Try fix macos static boost linkage
Browse files Browse the repository at this point in the history
  • Loading branch information
fdr400 committed Jan 6, 2025
1 parent d0c6d7a commit 008adcf
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 2 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,9 @@ jobs:
brew install [email protected]
brew install lld
brew link postgresql@16 # postgresql is key-only
brew link postgresql@16 # postgresql is keg-only
brew link --force zlib # keg-only + need for static linkage
brew link --force icu4c@76 # keg-only + need for static boost linkage
- name: Setup ccache
run: |
Expand Down
4 changes: 4 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,10 @@ if (USERVER_BUILD_TESTS)
add_subdirectory(testsuite)
endif()

find_package(ICU COMPONENTS uc i18n data REQUIRED)
add_library(icuuc ALIAS ICU::uc)
add_library(icui18n ALIAS ICU::i18n)
add_library(icudata ALIAS ICU::data)
add_subdirectory(universal)

if (USERVER_FEATURE_CORE)
Expand Down
1 change: 1 addition & 0 deletions scripts/docs/en/deps/alpine.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ clang17-extra-tools
clang18
cmake
curl-dev
curl-static
gflags-dev
git
grpc-cpp
Expand Down
3 changes: 2 additions & 1 deletion scripts/docs/en/deps/macos.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ares
boost
boost@1.87
c-ares
ccache
cctz
Expand All @@ -12,6 +12,7 @@ git
google-benchmark
googletest
hiredis
icu4c@76
jemalloc
krb5
libev
Expand Down

0 comments on commit 008adcf

Please sign in to comment.