Merge IB/CMSSW_14_2_X/master into IB/CMSSW_14_2_X/rootmaster.

cms-sw · Sep 4, 2024 · 547bb5f · 547bb5f
2 parents 585c914 + bff455b
commit 547bb5f
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 37 deletions.
diff --git a/clang-uml.spec b/clang-uml.spec
@@ -1,6 +1,6 @@
-### RPM external clang-uml 0.4.1
+### RPM external clang-uml 0.5.2
 
-%define tag 429e1c47a9669438651076a719de29c00fd18f7b
+%define tag cd6dce2b0b34d55534d3de512ab088b9ad71bc76
 %define branch master
 
 %define github_user bkryza

diff --git a/llvm.spec b/llvm.spec
@@ -1,15 +1,15 @@
-### RPM external llvm 17.0.3
+### RPM external llvm 18.1.6
 ## INITENV +PATH LD_LIBRARY_PATH %{i}/lib64
 ## INITENV +PATH PYTHON3PATH %{i}/lib64/python%{cms_python3_major_minor_version}/site-packages
 
 BuildRequires: cmake ninja
 Requires: gcc zlib python3 libxml2 zstd
 %{!?without_cuda:Requires: cuda}
 
-%define llvmCommit 83204dfcd4277154e46a5c6094aee389a7f260e8
-%define llvmBranch cms/release/17.x/afbe354
-%define iwyuCommit db886395c3884c4e7d948746b2a9e845b507c200
-%define iwyuBranch master
+%define llvmCommit 02c7568fc9f555b2c72fc169c8c68e2116d97382
+%define llvmBranch cms/release/18.x/1118c2e
+%define iwyuCommit 377eaef70cdda47368939f4d9beabfabe3f628f0
+%define iwyuBranch clang_18
 
 Source0: git+https://github.com/cms-externals/llvm-project.git?obj=%{llvmBranch}/%{llvmCommit}&export=llvm-%{realversion}-%{llvmCommit}&module=llvm-%{realversion}-%{llvmCommit}&output=/llvm-%{realversion}-%{llvmCommit}.tgz
 Source1: git+https://github.com/include-what-you-use/include-what-you-use.git?obj=%{iwyuBranch}/%{iwyuCommit}&export=iwyu-%{realversion}-%{iwyuCommit}&module=iwyu-%{realversion}-%{iwyuCommit}&output=/iwyu-%{realversion}-%{iwyuCommit}.tgz

diff --git a/py3-dxr-Markup.patch b/py3-dxr-Markup.patch
diff --git a/py3-dxr.spec b/py3-dxr.spec
@@ -2,16 +2,14 @@
 ## INITENV +PATH PYTHON3PATH %i/${PYTHON3_LIB_SITE_PACKAGES}
 Requires: zlib llvm sqlite
 Requires: py3-Jinja2 py3-parsimonious py3-pysqlite3 py3-Pygments
-%define dxrCommit e79425eded8ca0ae882b4ccceaf27ae1aab446d3
-%define branch cms/6ea764102a/py3
+%define dxrCommit d3c6e5b745c93b6e7788c734f7cb0dc14d957d37
+%define branch cms/6ea764102a/clang18
 
 Source0: git+https://github.com/cms-externals/dxr.git?obj=%{branch}/%{dxrCommit}&export=dxr-%{dxrCommit}&module=dxr-%dxrCommit&output=/dxr-%{dxrCommit}.tgz
-Patch0: py3-dxr-Markup
 %define keep_archives true
 
 %prep
 %setup -n dxr-%dxrCommit
-%patch0 -p1
 
 %build
 export SQLITE_ROOT

diff --git a/scram-tools.file/tools/llvm/llvm-cxxcompiler.xml b/scram-tools.file/tools/llvm/llvm-cxxcompiler.xml
@@ -31,6 +31,7 @@
     <flags CXXFLAGS="-ftemplate-depth=512"/>
     <flags CXXFLAGS="-Wno-error=potentially-evaluated-expression"/>
     <flags CXXFLAGS="-Wno-tautological-type-limit-compare"/>
+    <flags CXXFLAGS="-Wno-vla-cxx-extension"/>
     <flags CXXFLAGS="-fsized-deallocation"/>
 %if 0%{!?use_system_gcc:1}
     <flags CXXFLAGS="--gcc-toolchain=@GCC_ROOT@"/>