Skip to content

Removed reference to gcc-8.5.patch for openldap on darwin platform #2621

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
craigcomstock wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Removed reference to gcc-8.5.patch for openldap on darwin platform #2621

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d2af07d
Removed reference to gcc-8.5.patch for openldap on darwin platform
craigcomstock Nov 10, 2026
7afdb28
Adjusted where protoc/protobuf is installed to $HOME/.cache/cfengine
craigcomstock Nov 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions deps-packaging/leech2/darwin/build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ TTD=${BUILD_ROOT}/cfbuild-leech2-devel${PREFIX}
export RUSTUP_HOME="$HOME/.cache/cfengine/buildscripts"/rust
export PATH="$HOME/.cache/cfengine/buildscripts"/rust/bin:$PATH

# Use the protoc installed in $HOME/.cache
export PATH="$HOME/.cache/cfengine/buildscripts/protobuf/bin:$PATH"

# Embed an rpath of ${PREFIX}/lib in libleech2.dylib so it resolves
# co-bundled CFEngine libraries at runtime, matching every other bundled dep
# (enterprise's rpath_test.sh requires every /var/cfengine/lib/lib*.dylib to
Expand Down
1 change: 0 additions & 1 deletion deps-packaging/openldap/darwin/build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ TTD=${TTD_ROOT}${PREFIX}
# Patch

$PATCH -p0 <no_Sockaddr_redefine.patch
$PATCH -p1 <gcc-8.5.patch

# Configure

Expand Down
Loading