From 2264624af9a47e85d6d44b92c8cb8fc2463b40ff Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Thu, 30 Oct 2025 20:44:47 -0500 Subject: [PATCH 1/2] Adjusted cf3_with_library to handle case where --with-feature is not 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 --- m4/cf3_with_library.m4 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/m4/cf3_with_library.m4 b/m4/cf3_with_library.m4 index ee47d7d11d..dde7181dfb 100644 --- a/m4/cf3_with_library.m4 +++ b/m4/cf3_with_library.m4 @@ -84,7 +84,8 @@ AC_DEFUN([CF3_WITH_LIBRARY], if test "x$with_[$1]" != xyes && test "x$with_[$1]" != xcheck && test "x$with_[$1]" != x/usr && - test "x$with_[$1]" != x/ + test "x$with_[$1]" != x/ && + test -n "$with_[$1]" then ULN[]_LDFLAGS="$ULN[]_LDFLAGS -R$with_[$1]/lib" fi From a7d6bb2f9c1def008ee1576aca85eb5f4cfb54fa Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Sat, 1 Nov 2025 17:53:08 -0500 Subject: [PATCH 2/2] Fixed compile trouble with CLOCK_MONOTONIC on exotic platform (HP/UX) 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 --- libpromises/eval_context.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libpromises/eval_context.c b/libpromises/eval_context.c index 3df59eae32..e0a4800992 100644 --- a/libpromises/eval_context.c +++ b/libpromises/eval_context.c @@ -3972,7 +3972,12 @@ void EvalContextAddFunctionEvent(EvalContext *ctx, const FnCall *fp, int64_t sta int64_t EvalContextEventStart() { struct timespec ts; +#ifdef CLOCK_MONOTONIC clock_gettime(CLOCK_MONOTONIC, &ts); +#else +// As in libcfnet/net.c some OS-es don't have monotonic clock, realtime clock is best we can do. + clock_gettime(CLOCK_REALTIME, &ts); +#endif return ts.tv_sec * 1000000000LL + ts.tv_nsec; }