Skip to content

Commit aa7ba58

Browse files
committed
fix(depends): make it compilable with Xcode 15 on macos
1 parent e4c9cb5 commit aa7ba58

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

depends/packages/boost.mk

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,12 @@ $(package)_config_opts_i686_android=address-model=32
2121
$(package)_config_opts_aarch64_android=address-model=64
2222
$(package)_config_opts_x86_64_android=address-model=64
2323
$(package)_config_opts_armv7a_android=address-model=32
24+
unary_function=unary_function
2425
ifneq (,$(findstring clang,$($(package)_cxx)))
2526
$(package)_toolset_$(host_os)=clang
27+
ifeq ($(build_os),darwin)
28+
unary_function=__unary_function
29+
endif
2630
else
2731
$(package)_toolset_$(host_os)=gcc
2832
endif
@@ -36,8 +40,10 @@ $(package)_cxxflags_x86_64=-fcf-protection=full
3640
endef
3741

3842
# Fix unused variable in boost_process, can be removed after upgrading to 1.72
43+
# Fix missing unary_function in clang15 on macos, can be removed after upgrading to 1.81
3944
define $(package)_preprocess_cmds
4045
sed -i.old "s/int ret_sig = 0;//" boost/process/detail/posix/wait_group.hpp && \
46+
sed -i.old "s/unary_function/$(unary_function)/" boost/container_hash/hash.hpp && \
4147
echo "using $($(package)_toolset_$(host_os)) : : $($(package)_cxx) : <cflags>\"$($(package)_cflags)\" <cxxflags>\"$($(package)_cxxflags)\" <compileflags>\"$($(package)_cppflags)\" <linkflags>\"$($(package)_ldflags)\" <archiver>\"$($(package)_ar)\" <striper>\"$(host_STRIP)\" <ranlib>\"$(host_RANLIB)\" <rc>\"$(host_WINDRES)\" : ;" > user-config.jam
4248
endef
4349

0 commit comments

Comments
 (0)