Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[llvm] Update to version 18.1.6 #9200

Merged
merged 5 commits into from
Jun 6, 2024
Merged

[llvm] Update to version 18.1.6 #9200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d1da409
[llvm] Update to version 18.1.6
smuzaffar May 21, 2024
0ba67e2
use clang_18 for iwyu and added fp-nsan
smuzaffar May 22, 2024
bd34183
Update llvm.spec
smuzaffar May 22, 2024
bdcf567
updates needed for clang18
smuzaffar May 23, 2024
be58d37
added Wno-vla-cxx-extension for clang builds
smuzaffar Jun 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions clang-uml.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
10 changes: 5 additions & 5 deletions llvm.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
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
Expand Down
26 changes: 0 additions & 26 deletions py3-dxr-Markup.patch
View file
Open in desktop

This file was deleted.

6 changes: 2 additions & 4 deletions py3-dxr.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions scram-tools.file/tools/llvm/llvm-cxxcompiler.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
<flags CXXFLAGS="--gcc-toolchain=@GCC_ROOT@"/>
<runtime name="@OS_RUNTIME_LDPATH_NAME@" value="$LLVM_CXXCOMPILER_BASE/lib64" type="path"/>
Expand Down