Merge branch 'IB/CMSSW_12_3_X/master' into davidlange6-patch-1

cms-sw · Feb 4, 2022 · 6f5cf42 · 6f5cf42
2 parents ce92767 + a822596
commit 6f5cf42
Show file tree

Hide file tree

Showing 107 changed files with 211 additions and 4,621 deletions.
diff --git a/0001-Revert-r248245-breaks-ROOT.patch b/0001-Revert-r248245-breaks-ROOT.patch
diff --git a/OpenBLAS.spec b/OpenBLAS.spec
@@ -19,10 +19,10 @@ Patch1: OpenBLAS-disable-tests
 make %{build_opts} TARGET=CORE2
 %endif
 %ifarch aarch64
-make %{build_opts} TARGET=ARMV8
+make %{build_opts} TARGET=ARMV8 CFLAGS="%{arch_build_flags}"
 %endif
 %ifarch ppc64le
-make %{build_opts} CFLAGS="%{ppc64le_build_flags}"
+make %{build_opts} CFLAGS="%{arch_build_flags}"
 %endif
 
 %install

diff --git a/SCRAMV1.spec b/SCRAMV1.spec
@@ -1,8 +1,8 @@
-### RPM lcg SCRAMV1 V3_00_33
+### RPM lcg SCRAMV1 V3_00_35
 ## NOCOMPILER
 ## NO_VERSION_SUFFIX
 
-%define tag 4ae4e4cde2026f0b88189e8f748a5fd47f0f44fb
+%define tag ccc0e75f60ca196ad10516492f27ac163a28b6f9
 %define branch SCRAMV3
 %define github_user cms-sw
 Source: git+https://github.com/%{github_user}/SCRAM.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}-%{tag}.tgz

diff --git a/alpaka.spec b/alpaka.spec
@@ -1,11 +1,13 @@
-### RPM external alpaka 0.7.0
+### RPM external alpaka develop-20220124
 ## NOCOMPILER
 
-Source: https://github.com/alpaka-group/%{n}/archive/%{realversion}.tar.gz
+%define git_commit 26cabb4d5a635c75a75e37d4c4770d3bb71dcd1c
+
+Source: https://github.com/alpaka-group/%{n}/archive/%{git_commit}.tar.gz
 Requires: boost
 
 %prep
-%setup -n %{n}-%{realversion}
+%setup -n %{n}-%{git_commit}
 
 %build