From 94f1e00a038f1ae2f0a4be9f0b1227a24f7b09f7 Mon Sep 17 00:00:00 2001 From: Niko Mauno Date: Mon, 7 Oct 2024 16:24:36 +0300 Subject: [PATCH 1/2] CMakelists.txt: Stop using Make automatic variable CMake Makefile layout generation has changed since version 3.20, ref: https://discourse.cmake.org/t/base-filename-gets-set-to-compiler-depend-ts-after-update-to-cmake-3-20/3075/4 For instance with Yocto framework this approach can lead to QA issue stemming from build host path ending up in generated binary like ERROR: fluentbit-3.1.9-r0 do_package_qa: QA Issue: File /usr/bin/fluent-bit in package fluentbit contains reference to TMPDIR [buildpaths] ERROR: fluentbit-3.1.9-r0 do_package_qa: Fatal QA errors were found, failing task. stemming from $ strings packages-split/fluentbit/usr/bin/fluent-bit ... $(subst /yocto/upstream/build/tmp/work/cortexa57-poky-linux/fluentbit/3.1.9/git/,,$(abspath $<)) ... Signed-off-by: Niko Mauno --- CMakeLists.txt | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e60b6cb..829c9cf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,12 +30,8 @@ set(CTR_VERSION_MINOR 7) set(CTR_VERSION_PATCH 1) set(CTR_VERSION_STR "${CTR_VERSION_MAJOR}.${CTR_VERSION_MINOR}.${CTR_VERSION_PATCH}") -# Define __FILENAME__ consistently across Operating Systems -if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__='\"$$(subst ${CMAKE_SOURCE_DIR}/,,$$(abspath $$<))\"'") -else() - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__") -endif() +# Define __FILENAME__ +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__") # Configuration options option(CTR_DEV "Enable development mode" No) From 9ef34ef75ff88c0c7338891e50487ebbab31a01a Mon Sep 17 00:00:00 2001 From: Eduardo Silva Date: Sun, 12 Jul 2026 19:10:58 -0600 Subject: [PATCH 2/2] core: namespace filename macro Signed-off-by: Eduardo Silva --- CMakeLists.txt | 4 ++-- include/ctraces/ctr_log.h | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 829c9cf..ea96db6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,8 +30,8 @@ set(CTR_VERSION_MINOR 7) set(CTR_VERSION_PATCH 1) set(CTR_VERSION_STR "${CTR_VERSION_MAJOR}.${CTR_VERSION_MINOR}.${CTR_VERSION_PATCH}") -# Define __FILENAME__ -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__") +# Define __CTR_FILENAME__ +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__CTR_FILENAME__=__FILE__") # Configuration options option(CTR_DEV "Enable development mode" No) diff --git a/include/ctraces/ctr_log.h b/include/ctraces/ctr_log.h index c4aae2a..392a93c 100644 --- a/include/ctraces/ctr_log.h +++ b/include/ctraces/ctr_log.h @@ -38,27 +38,27 @@ void ctr_log_print(void *ctx, int level, const char *file, int line, int ctr_errno_print(int errnum, const char *file, int line); #define ctr_log_error(ctx, fmt, ...) \ - ctr_log_print(ctx, CTR_LOG_ERROR, __FILENAME__, \ + ctr_log_print(ctx, CTR_LOG_ERROR, __CTR_FILENAME__, \ __LINE__, fmt, ##__VA_ARGS__) #define ctr_log_warn(ctx, fmt, ...) \ - ctr_log_print(ctx, CTR_LOG_WARN, __FILENAME__, \ + ctr_log_print(ctx, CTR_LOG_WARN, __CTR_FILENAME__, \ __LINE__, fmt, ##__VA_ARGS__) #define ctr_log_info(ctx, fmt, ...) \ - ctr_log_print(ctx, CTR_LOG_INFO, __FILENAME__, \ + ctr_log_print(ctx, CTR_LOG_INFO, __CTR_FILENAME__, \ __LINE__, fmt, ##__VA_ARGS__) #define ctr_log_debug(ctx, fmt, ...) \ - ctr_log_print(ctx, CTR_LOG_DEBUG, __FILENAME__, \ + ctr_log_print(ctx, CTR_LOG_DEBUG, __CTR_FILENAME__, \ __LINE__, fmt, ##__VA_ARGS__) #define ctr_log_trace(ctx, fmt, ...) \ - ctr_log_print(ctx, CTR_LOG_TRACE, __FILENAME__, \ + ctr_log_print(ctx, CTR_LOG_TRACE, __CTR_FILENAME__, \ __LINE__, fmt, ##__VA_ARGS__) -#ifdef __FILENAME__ -#define ctr_errno() ctr_errno_print(errno, __FILENAME__, __LINE__) +#ifdef __CTR_FILENAME__ +#define ctr_errno() ctr_errno_print(errno, __CTR_FILENAME__, __LINE__) #else #define ctr_errno() ctr_errno_print(errno, __FILE__, __LINE__) #endif