From d2af07deed6a1897f02ec5eba661e88f00184b15 Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Tue, 10 Nov 2026 15:21:12 -0600 Subject: [PATCH 1/2] Removed reference to gcc-8.5.patch for openldap on darwin platform Was missed due to lack of CI to show the problem in commit 5cc1cbc54e569957642fdca10f9458c7ffd650bc Ticket: ENT-9880 Changelog: none --- deps-packaging/openldap/darwin/build | 1 - 1 file changed, 1 deletion(-) diff --git a/deps-packaging/openldap/darwin/build b/deps-packaging/openldap/darwin/build index 7182e5629..0bc8cc675 100755 --- a/deps-packaging/openldap/darwin/build +++ b/deps-packaging/openldap/darwin/build @@ -14,7 +14,6 @@ TTD=${TTD_ROOT}${PREFIX} # Patch $PATCH -p0 Date: Wed, 11 Nov 2026 15:31:35 -0600 Subject: [PATCH 2/2] Adjusted where protoc/protobuf is installed to $HOME/.cache/cfengine Ticket: ENT-9880 Changelog: none --- deps-packaging/leech2/darwin/build | 3 +++ 1 file changed, 3 insertions(+) diff --git a/deps-packaging/leech2/darwin/build b/deps-packaging/leech2/darwin/build index 6e49dd12a..9a0221706 100755 --- a/deps-packaging/leech2/darwin/build +++ b/deps-packaging/leech2/darwin/build @@ -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