From 8bd63e170c95b60cab100b77d13d7c5dca7fd088 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Wed, 8 Oct 2025 15:26:20 +0100 Subject: [PATCH] clang: consolidate LLVM_APPEND_VC_REV=OFF Whilst the change to add TMPDIR to GIT_CEILING_DIRECTORIES should stop LLVM from embedding git information into the recipes, also disable this behaviour explicitly. We do this because it's not just the sha of the source tree but also the full URL of the repository, which would be an information leak if an internal git mirror was being used. (From OE-Core rev: 9247e242bf0e2384142427b67e5f1f7b4018c45d) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-devtools/clang/clang_git.bb | 1 - meta/recipes-devtools/clang/common-clang.inc | 4 ++++ meta/recipes-devtools/clang/openmp_git.bb | 1 - 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/clang/clang_git.bb b/meta/recipes-devtools/clang/clang_git.bb index ca53963590..e10c327a2a 100644 --- a/meta/recipes-devtools/clang/clang_git.bb +++ b/meta/recipes-devtools/clang/clang_git.bb @@ -57,7 +57,6 @@ SOLIBSDEV:mingw32 = ".pyd" #CMAKE_VERBOSE = "VERBOSE=1" EXTRA_OECMAKE += "-DLLVM_ENABLE_ASSERTIONS=OFF \ - -DLLVM_APPEND_VC_REV=OFF \ -DLLVM_ENABLE_PIC=ON \ -DCLANG_DEFAULT_PIE_ON_LINUX=ON \ -DFFI_INCLUDE_DIR=$(pkg-config --variable=includedir libffi) \ diff --git a/meta/recipes-devtools/clang/common-clang.inc b/meta/recipes-devtools/clang/common-clang.inc index f7b7a1cf9a..2e9d3d73f9 100644 --- a/meta/recipes-devtools/clang/common-clang.inc +++ b/meta/recipes-devtools/clang/common-clang.inc @@ -48,4 +48,8 @@ def get_clang_target_arch(bb, d): # install they cause non-deterministic binaries. EXTRA_OECMAKE += "-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON" +# Don't embed found git information into the version string as this +# will include the git server URL. +EXTRA_OECMAKE += "-DLLVM_APPEND_VC_REV=OFF" + require common.inc diff --git a/meta/recipes-devtools/clang/openmp_git.bb b/meta/recipes-devtools/clang/openmp_git.bb index 2d86718dee..b6b1cc2978 100644 --- a/meta/recipes-devtools/clang/openmp_git.bb +++ b/meta/recipes-devtools/clang/openmp_git.bb @@ -18,7 +18,6 @@ inherit cmake pkgconfig perlnative python3native python3targetconfig DEPENDS += "elfutils libffi clang" EXTRA_OECMAKE += "-DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DLLVM_APPEND_VC_REV=OFF \ -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF \ -DOPENMP_LIBDIR_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \ -DOPENMP_STANDALONE_BUILD=ON \