Skip to content

Commit

Permalink
build: patch boost process for macOS 14 SDK
Browse files Browse the repository at this point in the history
  • Loading branch information
fanquake committed Dec 5, 2023
1 parent 423949a commit 51c97ff
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 0 deletions.
5 changes: 5 additions & 0 deletions depends/packages/boost.mk
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@ $(package)_version=1.81.0
$(package)_download_path=https://boostorg.jfrog.io/artifactory/main/release/$($(package)_version)/source/
$(package)_file_name=boost_$(subst .,_,$($(package)_version)).tar.bz2
$(package)_sha256_hash=71feeed900fbccca04a3b4f2f84a7c217186f28a940ed8b7ed4725986baf99fa
$(package)_patches=process_macos_sdk.patch

define $(package)_preprocess_cmds
patch -p1 < $($(package)_patch_dir)/process_macos_sdk.patch
endef

define $(package)_stage_cmds
mkdir -p $($(package)_staging_prefix_dir)/include && \
Expand Down
27 changes: 27 additions & 0 deletions depends/patches/boost/process_macos_sdk.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
Fix Boost Process compilation with macOS 14 SDK.
Can be dropped with Boost 1.84.0.
https://github.com/boostorg/process/pull/343.
https://github.com/boostorg/process/issues/342.

diff --git a/boost/process/detail/posix/handles.hpp b/boost/process/detail/posix/handles.hpp
index cd9e1ce5a..304e77b1c 100644
--- a/boost/process/detail/posix/handles.hpp
+++ b/boost/process/detail/posix/handles.hpp
@@ -33,7 +33,7 @@ inline std::vector<native_handle_type> get_handles(std::error_code & ec)
else
ec.clear();

- auto my_fd = ::dirfd(dir.get());
+ auto my_fd = dirfd(dir.get());

struct ::dirent * ent_p;

@@ -117,7 +117,7 @@ struct limit_handles_ : handler_base_ext
return;
}

- auto my_fd = ::dirfd(dir);
+ auto my_fd = dirfd(dir);
struct ::dirent * ent_p;

while ((ent_p = readdir(dir)) != nullptr)

0 comments on commit 51c97ff

Please sign in to comment.