From 916c074a136e8e07f388c2c41d197a15a4c50022 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 29 Sep 2025 18:11:24 +0100 Subject: [PATCH] clang: fix reproducibility issue in LLVMConfig.cmake The LLVMConfig.cmake file is mostly LLVM configuration, but it also specifies if some Python modules (needed by the opt-viewer tool) were present on the build host. This is host contamination and a source of non-determinism, so remove it from the installed file. A ticket has been filed upstream to resolve this: https://github.com/llvm/llvm-project/issues/161199 Signed-off-by: Ross Burton Signed-off-by: Mathieu Dubois-Briand --- ...-expose-LLVM_HAVE_OPT_VIEWER_MODULES.patch | 29 +++++++++++++++++++ meta/recipes-devtools/clang/common.inc | 1 + 2 files changed, 30 insertions(+) create mode 100644 meta/recipes-devtools/clang/clang/0001-dont-expose-LLVM_HAVE_OPT_VIEWER_MODULES.patch diff --git a/meta/recipes-devtools/clang/clang/0001-dont-expose-LLVM_HAVE_OPT_VIEWER_MODULES.patch b/meta/recipes-devtools/clang/clang/0001-dont-expose-LLVM_HAVE_OPT_VIEWER_MODULES.patch new file mode 100644 index 0000000000..4f6ab6d00f --- /dev/null +++ b/meta/recipes-devtools/clang/clang/0001-dont-expose-LLVM_HAVE_OPT_VIEWER_MODULES.patch @@ -0,0 +1,29 @@ +From b6af0a5b42adfbebaca1ee673d4c1d9d10fbacfb Mon Sep 17 00:00:00 2001 +From: Ross Burton +Date: Mon, 29 Sep 2025 14:44:05 +0100 +Subject: [PATCH] Don't expose LLVM_HAVE_OPT_VIEWER_MODULES externally + +This variable states whether at build-time some python modules were present, +which is meaningless and simply introduces non-deterministic behaviour. + +Upstream-Status: Pending [https://github.com/llvm/llvm-project/issues/161199] +Signed-off-by: Ross Burton +--- + llvm/cmake/modules/LLVMConfig.cmake.in | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/llvm/cmake/modules/LLVMConfig.cmake.in b/llvm/cmake/modules/LLVMConfig.cmake.in +index c15b9576cd5d..9cff70e4ef8e 100644 +--- a/llvm/cmake/modules/LLVMConfig.cmake.in ++++ b/llvm/cmake/modules/LLVMConfig.cmake.in +@@ -135,7 +135,6 @@ set(LLVM_DEFINITIONS "@LLVM_DEFINITIONS@") + set(LLVM_BINARY_DIR "@LLVM_CONFIG_BINARY_DIR@") + set(LLVM_CMAKE_DIR "@LLVM_CONFIG_CMAKE_DIR@") + set(LLVM_TOOLS_BINARY_DIR "@LLVM_CONFIG_TOOLS_BINARY_DIR@") +-set(LLVM_HAVE_OPT_VIEWER_MODULES @LLVM_HAVE_OPT_VIEWER_MODULES@) + set(LLVM_CONFIGURATION_TYPES @CMAKE_CONFIGURATION_TYPES@) + set(LLVM_ENABLE_SHARED_LIBS @BUILD_SHARED_LIBS@) + +-- +2.43.0 + diff --git a/meta/recipes-devtools/clang/common.inc b/meta/recipes-devtools/clang/common.inc index 512bf1dd02..b8f7d41089 100644 --- a/meta/recipes-devtools/clang/common.inc +++ b/meta/recipes-devtools/clang/common.inc @@ -61,6 +61,7 @@ SRC_URI = "\ file://0038-Prevent-revisiting-block-when-searching-for-noreturn.patch \ file://0039-Only-build-c-index-test-when-clang-tests-are-include.patch \ file://0001-Install-lldb-tblgen.patch \ + file://0001-dont-expose-LLVM_HAVE_OPT_VIEWER_MODULES.patch \ " # Fallback to no-PIE if not set GCCPIE ??= "" -- 2.47.3