Skip to content

Conversation

@craigcomstock
Copy link
Contributor

In the case of pam and lmdb, due to checks for brew, --with-pam and --with-lmdb, if not specified by the user, are not defined.
This resulted in -R/lib being added to LMDB_LDFLAGS and PAM_LDFLAGS and by appending: CORE_LDFLAGS.

This -R/lib adds an RPATH which rhel-10 rpmbuild complains about since it is a standard path that should not be included in RPATHS.

Ticket: ENT-13016
Changelog: none

…defined

In the case of pam and lmdb, due to checks for brew, --with-pam and --with-lmdb, if not specified by the user, are not defined.
This resulted in -R/lib being added to LMDB_LDFLAGS and PAM_LDFLAGS and by appending: CORE_LDFLAGS.

This -R/lib adds an RPATH which rhel-10 rpmbuild complains about since it is a standard path that should not be included in RPATHS.

Ticket: ENT-13016
Changelog: none
@craigcomstock
Copy link
Contributor Author

craigcomstock commented Oct 31, 2025

Will wait for jenkins on buildscripts#1932 before merging :)

CLOCK_MONOTONIC is not available on all platforms so fallback to CLOCK_REALTIME.
It will have to be "good enough".

Ticket: ENT-13320
Changelog: none
@craigcomstock craigcomstock changed the title Adjusted cf3_with_library to handle case where --with-feature is not defined Various fixups related to rhel-10 and deb-13 platforms Nov 1, 2025
@craigcomstock craigcomstock merged commit 8fad010 into cfengine:master Nov 3, 2025
50 of 53 checks passed
@craigcomstock craigcomstock deleted the ENT-13016/master branch November 3, 2025 13:46
@craigcomstock craigcomstock added the cherry-pick? Fixes which may need to be cherry-picked to LTS branches label Nov 3, 2025
@craigcomstock
Copy link
Contributor Author

the cf_with_library macro fix should be cherry picked if needed, the monotonic clock doesn't need cherry picking as that is part of master-only policy analyzer.

@craigcomstock
Copy link
Contributor Author

rhel-10 is only going to 3.24.x so only cherry picked there, and also didn't include the fix for policy profiler since that is master only: #5932

@craigcomstock craigcomstock removed the cherry-pick? Fixes which may need to be cherry-picked to LTS branches label Nov 4, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

2 participants