From 60314e8969e665a8e8109dd96e482cdcb0639bd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Cumplido?= Date: Mon, 3 Nov 2025 09:26:44 +0100 Subject: [PATCH 1/3] GH-48025: [C++] Replace CMAKE_SOURCE_DIR and CMAKE_BINARY_DIR with constant string --- cpp/src/arrow/CMakeLists.txt | 4 ++++ cpp/src/arrow/util/config.h.cmake | 1 - cpp/src/arrow/util/config_internal.h.cmake | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/cpp/src/arrow/CMakeLists.txt b/cpp/src/arrow/CMakeLists.txt index 25e5749335a0..2e5c67e07b6e 100644 --- a/cpp/src/arrow/CMakeLists.txt +++ b/cpp/src/arrow/CMakeLists.txt @@ -342,6 +342,10 @@ macro(append_runtime_avx512_src SRCS SRC) endmacro() # Write out compile-time configuration constants +string(REPLACE "${CMAKE_SOURCE_DIR}" "" REDACTED_CXX_FLAGS + ${CMAKE_CXX_FLAGS}) +string(REPLACE "${CMAKE_BINARY_DIR}" "" REDACTED_CXX_FLAGS + ${REDACTED_CXX_FLAGS}) configure_file("util/config.h.cmake" "util/config.h" ESCAPE_QUOTES) configure_file("util/config_internal.h.cmake" "util/config_internal.h" ESCAPE_QUOTES) install(FILES "${CMAKE_CURRENT_BINARY_DIR}/util/config.h" diff --git a/cpp/src/arrow/util/config.h.cmake b/cpp/src/arrow/util/config.h.cmake index ddff1379b1d3..cf98757c4a8d 100644 --- a/cpp/src/arrow/util/config.h.cmake +++ b/cpp/src/arrow/util/config.h.cmake @@ -27,7 +27,6 @@ #define ARROW_CXX_COMPILER_ID "@CMAKE_CXX_COMPILER_ID@" #define ARROW_CXX_COMPILER_VERSION "@CMAKE_CXX_COMPILER_VERSION@" -#define ARROW_CXX_COMPILER_FLAGS "@CMAKE_CXX_FLAGS@" #define ARROW_BUILD_TYPE "@UPPERCASE_BUILD_TYPE@" diff --git a/cpp/src/arrow/util/config_internal.h.cmake b/cpp/src/arrow/util/config_internal.h.cmake index e90f7ee12da4..bee1a6b8fbb6 100644 --- a/cpp/src/arrow/util/config_internal.h.cmake +++ b/cpp/src/arrow/util/config_internal.h.cmake @@ -17,6 +17,7 @@ // These variables are not exposed as they can make compilation caching // and increment builds less efficient. +#define ARROW_CXX_COMPILER_FLAGS "@REDACTED_CXX_FLAGS@" #define ARROW_GIT_ID "@ARROW_GIT_ID@" #define ARROW_GIT_DESCRIPTION "@ARROW_GIT_DESCRIPTION@" From 19faa3b0ee82c89c0607faf7011dac174f9eb2ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Cumplido?= Date: Mon, 3 Nov 2025 09:27:44 +0100 Subject: [PATCH 2/3] Replace mkenums @filename@ for @basename@ to stop leaking the build path --- c_glib/arrow-dataset-glib/enums.c.template | 2 +- c_glib/arrow-dataset-glib/enums.h.template | 2 +- c_glib/arrow-glib/enums.c.template | 2 +- c_glib/arrow-glib/enums.h.template | 2 +- c_glib/gandiva-glib/enums.c.template | 2 +- c_glib/gandiva-glib/enums.h.template | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/c_glib/arrow-dataset-glib/enums.c.template b/c_glib/arrow-dataset-glib/enums.c.template index 8921ab06252d..d1f774a76735 100644 --- a/c_glib/arrow-dataset-glib/enums.c.template +++ b/c_glib/arrow-dataset-glib/enums.c.template @@ -23,7 +23,7 @@ /*** BEGIN file-production ***/ -/* enumerations from "@filename@" */ +/* enumerations from "@basename@" */ /*** END file-production ***/ /*** BEGIN value-header ***/ diff --git a/c_glib/arrow-dataset-glib/enums.h.template b/c_glib/arrow-dataset-glib/enums.h.template index 8b89a8b031bd..f658f47495cc 100644 --- a/c_glib/arrow-dataset-glib/enums.h.template +++ b/c_glib/arrow-dataset-glib/enums.h.template @@ -29,7 +29,7 @@ G_BEGIN_DECLS /*** BEGIN file-production ***/ -/* enumerations from "@filename@" */ +/* enumerations from "@basename@" */ /*** END file-production ***/ /*** BEGIN value-header ***/ diff --git a/c_glib/arrow-glib/enums.c.template b/c_glib/arrow-glib/enums.c.template index 6806ed194efd..9a5a9ba09c0c 100644 --- a/c_glib/arrow-glib/enums.c.template +++ b/c_glib/arrow-glib/enums.c.template @@ -23,7 +23,7 @@ /*** BEGIN file-production ***/ -/* enumerations from "@filename@" */ +/* enumerations from "@basename@" */ /*** END file-production ***/ /*** BEGIN value-header ***/ diff --git a/c_glib/arrow-glib/enums.h.template b/c_glib/arrow-glib/enums.h.template index e49b717fb30d..ee1fb5f7a076 100644 --- a/c_glib/arrow-glib/enums.h.template +++ b/c_glib/arrow-glib/enums.h.template @@ -29,7 +29,7 @@ G_BEGIN_DECLS /*** BEGIN file-production ***/ -/* enumerations from "@filename@" */ +/* enumerations from "@basename@" */ /*** END file-production ***/ /*** BEGIN value-header ***/ diff --git a/c_glib/gandiva-glib/enums.c.template b/c_glib/gandiva-glib/enums.c.template index 7ea2ea7b5f52..5f8b80a7702f 100644 --- a/c_glib/gandiva-glib/enums.c.template +++ b/c_glib/gandiva-glib/enums.c.template @@ -23,7 +23,7 @@ /*** BEGIN file-production ***/ -/* enumerations from "@filename@" */ +/* enumerations from "@basename@" */ /*** END file-production ***/ /*** BEGIN value-header ***/ diff --git a/c_glib/gandiva-glib/enums.h.template b/c_glib/gandiva-glib/enums.h.template index d362e14c1b2c..d07ed4680106 100644 --- a/c_glib/gandiva-glib/enums.h.template +++ b/c_glib/gandiva-glib/enums.h.template @@ -29,7 +29,7 @@ G_BEGIN_DECLS /*** BEGIN file-production ***/ -/* enumerations from "@filename@" */ +/* enumerations from "@basename@" */ /*** END file-production ***/ /*** BEGIN value-header ***/ From 426f560cbf799df93264d693e9058f7a67dd88bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Cumplido?= Date: Mon, 3 Nov 2025 11:33:12 +0100 Subject: [PATCH 3/3] Update cpp/src/arrow/util/config_internal.h.cmake Co-authored-by: Sutou Kouhei --- cpp/src/arrow/util/config_internal.h.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/cpp/src/arrow/util/config_internal.h.cmake b/cpp/src/arrow/util/config_internal.h.cmake index bee1a6b8fbb6..5d96e6fc68a6 100644 --- a/cpp/src/arrow/util/config_internal.h.cmake +++ b/cpp/src/arrow/util/config_internal.h.cmake @@ -17,6 +17,7 @@ // These variables are not exposed as they can make compilation caching // and increment builds less efficient. + #define ARROW_CXX_COMPILER_FLAGS "@REDACTED_CXX_FLAGS@" #define ARROW_GIT_ID "@ARROW_GIT_ID@"