From d1da40906348e392cee3bf17211d4067dfc9d778 Mon Sep 17 00:00:00 2001 From: Shahzad Malik Muzaffar Date: Tue, 21 May 2024 15:50:16 +0200 Subject: [PATCH 1/5] [llvm] Update to version 18.1.6 --- llvm.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/llvm.spec b/llvm.spec index 0aa8e47c3ea..231194fc317 100644 --- a/llvm.spec +++ b/llvm.spec @@ -1,4 +1,4 @@ -### 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 @@ -6,9 +6,9 @@ BuildRequires: cmake ninja Requires: gcc zlib python3 Requires: cuda -%define llvmCommit 83204dfcd4277154e46a5c6094aee389a7f260e8 -%define llvmBranch cms/release/17.x/afbe354 -%define iwyuCommit db886395c3884c4e7d948746b2a9e845b507c200 +%define llvmCommit 0a498c5f36995dfa2810d831f7e42804003a3672 +%define llvmBranch cms/release/18.x/1118c2e +%define iwyuCommit bc86a8fd570cb8344795564f74f2a5a27a6ea925 %define iwyuBranch master 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 From 0ba67e2d7200c263080c669acb2f4f73a94e6f4c Mon Sep 17 00:00:00 2001 From: Malik Shahzad Muzaffar Date: Wed, 22 May 2024 08:45:40 +0200 Subject: [PATCH 2/5] use clang_18 for iwyu and added fp-nsan --- llvm.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/llvm.spec b/llvm.spec index 231194fc317..16d4ec7dfe1 100644 --- a/llvm.spec +++ b/llvm.spec @@ -8,8 +8,8 @@ Requires: cuda %define llvmCommit 0a498c5f36995dfa2810d831f7e42804003a3672 %define llvmBranch cms/release/18.x/1118c2e -%define iwyuCommit bc86a8fd570cb8344795564f74f2a5a27a6ea925 -%define iwyuBranch master +%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 @@ -57,6 +57,7 @@ cmake %{_builddir}/llvm-%{realversion}-%{llvmCommit}/llvm \ ninja -v %{makeprocesses} ninja -v %{makeprocesses} check-clang-tools +ninja -v %{makeprocesses} check-nsan bin/clang-tidy --checks=* --list-checks | grep cms-handle %install From bd34183e1c767024fdbeddff652483e63632ad42 Mon Sep 17 00:00:00 2001 From: Malik Shahzad Muzaffar Date: Wed, 22 May 2024 10:25:49 +0200 Subject: [PATCH 3/5] Update llvm.spec --- llvm.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/llvm.spec b/llvm.spec index 16d4ec7dfe1..919c15137eb 100644 --- a/llvm.spec +++ b/llvm.spec @@ -57,7 +57,6 @@ cmake %{_builddir}/llvm-%{realversion}-%{llvmCommit}/llvm \ ninja -v %{makeprocesses} ninja -v %{makeprocesses} check-clang-tools -ninja -v %{makeprocesses} check-nsan bin/clang-tidy --checks=* --list-checks | grep cms-handle %install From bdcf567948658d1ef6deaf909de394347394430f Mon Sep 17 00:00:00 2001 From: Shahzad Malik Muzaffar Date: Thu, 23 May 2024 11:05:44 +0200 Subject: [PATCH 4/5] updates needed for clang18 --- clang-uml.spec | 4 ++-- llvm.spec | 2 +- py3-dxr-Markup.patch | 26 -------------------------- py3-dxr.spec | 6 ++---- 4 files changed, 5 insertions(+), 33 deletions(-) delete mode 100644 py3-dxr-Markup.patch diff --git a/clang-uml.spec b/clang-uml.spec index 8df41059738..e9e5acc4b1d 100644 --- 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 index 919c15137eb..c27303d4589 100644 --- a/llvm.spec +++ b/llvm.spec @@ -6,7 +6,7 @@ BuildRequires: cmake ninja Requires: gcc zlib python3 Requires: cuda -%define llvmCommit 0a498c5f36995dfa2810d831f7e42804003a3672 +%define llvmCommit 02c7568fc9f555b2c72fc169c8c68e2116d97382 %define llvmBranch cms/release/18.x/1118c2e %define iwyuCommit 377eaef70cdda47368939f4d9beabfabe3f628f0 %define iwyuBranch clang_18 diff --git a/py3-dxr-Markup.patch b/py3-dxr-Markup.patch deleted file mode 100644 index 56bed1649d0..00000000000 --- a/py3-dxr-Markup.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/dxr/build.py b/dxr/build.py -index 851a8c2..87c5a17 100644 ---- a/dxr/build.py -+++ b/dxr/build.py -@@ -22,7 +22,7 @@ from sys import exc_info - from traceback import format_exc - from warnings import warn - --from jinja2 import Markup -+from markupsafe import Markup - from collections import OrderedDict - - from dxr.config import Config -diff --git a/dxr/query.py b/dxr/query.py -index 8575b31..493fd5b 100644 ---- a/dxr/query.py -+++ b/dxr/query.py -@@ -4,7 +4,7 @@ import re - import struct - import time - --from jinja2 import Markup -+from markupsafe import Markup - from parsimonious import Grammar - from parsimonious.nodes import NodeVisitor - diff --git a/py3-dxr.spec b/py3-dxr.spec index c276e728ba4..fe57568ac3e 100644 --- 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 From be58d37bffff8cb33783d35bc30c810ed3a12471 Mon Sep 17 00:00:00 2001 From: Malik Shahzad Muzaffar Date: Wed, 5 Jun 2024 17:03:28 +0200 Subject: [PATCH 5/5] added Wno-vla-cxx-extension for clang builds --- scram-tools.file/tools/llvm/llvm-cxxcompiler.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/scram-tools.file/tools/llvm/llvm-cxxcompiler.xml b/scram-tools.file/tools/llvm/llvm-cxxcompiler.xml index 99148b216c7..ec33bdf505f 100644 --- a/scram-tools.file/tools/llvm/llvm-cxxcompiler.xml +++ b/scram-tools.file/tools/llvm/llvm-cxxcompiler.xml @@ -31,6 +31,7 @@ +