Skip to content

Commit c8d3f59

Browse files
authored
Merge branch 'IB/CMSSW_15_1_X/g14' into gcc14.3.1
2 parents 2df5a59 + 8c2e538 commit c8d3f59

File tree

3 files changed

+6
-8
lines changed

3 files changed

+6
-8
lines changed

data/cmsswdata.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ RecoTracker-LSTCore=V00-01-00
77
L1Trigger-L1TMuon=V01-12-00
88
RecoMuon-TrackerSeedGenerator=V00-07-00
99
DQM-Integration=V00-09-00
10-
Geometry-HGCalMapping=V00-01-00
10+
Geometry-HGCalMapping=V00-02-00
1111
RecoTracker-MkFit=V00-16-00
1212
RecoBTag-Combined=V01-30-00
1313
RecoEgamma-PhotonIdentification=V01-08-00

dd4hep.spec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
### RPM external dd4hep v01-29-00
2-
%define tag d119e3f8f5da75bd87632467df088197f84ed1b8
1+
### RPM external dd4hep v01-31-0x
2+
%define tag 4990888b50e29a5dc0ff65fc3a6fdf17205192a5
33
%define branch master
44
%define github_user AIDASoft
55

root.spec

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
### RPM lcg root 6.32.13
1+
### RPM lcg root 6.36.01
22
## INITENV +PATH PYTHON3PATH %{i}/lib
33
## INITENV SET ROOTSYS %{i}
44
## INCLUDE compilation_flags
55
## INCLUDE cpp-standard
6-
%define tag 63c27767f1be350ef3d684242da34f0d396cf97d
7-
%define branch cms/v6-32-00-patches/69384a6a78
6+
%define tag c09f63f39962137696b4221ab17fd12697d6912f
7+
%define branch cms/v6-36-00-patches/cfc322d3ab
88

99
%define github_user cms-sw
1010
Source: git+https://github.com/%{github_user}/root.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}-%{tag}.tgz
@@ -92,7 +92,6 @@ cmake ../%{n}-%{realversion} \
9292
-Dbuiltin_glew=ON \
9393
-Dbuiltin_ftgl=ON \
9494
-Dbuiltin_gl2ps=ON \
95-
-Dbuiltin_afterimage=ON \
9695
-Dbuiltin_xxhash=ON \
9796
-Dbuiltin_nlohmannjson=ON \
9897
-Darrow=OFF \
@@ -130,7 +129,6 @@ cmake ../%{n}-%{realversion} \
130129
-Dalien=OFF \
131130
-Dmonalisa=OFF \
132131
%ifarch darwin
133-
-Dbuiltin_afterimage=OFF \
134132
-Dcocoa=OFF \
135133
-Dx11=ON \
136134
-Dcastor=OFF \

0 commit comments

Comments
 (0)