Merge IB/CMSSW_12_0_X/master into IB/CMSSW_12_0_X/rootmaster.

vecgeom-fix-vector.patch

@@ -1,13 +1,13 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a090c57..7dbb121 100644
+index e6a4329..7e77333 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -85,7 +85,7 @@ endif()
+@@ -92,7 +92,7 @@ endif()
  # - ISA
  set(VECGEOM_ISAS empty)
  if(CMAKE_SYSTEM_PROCESSOR MATCHES "(i686|x86_64)")
--  set(VECGEOM_ISAS sse2 sse3 ssse3 sse4.1 sse4.2 avx avx2 mic mic_avx512 native empty)
-+  set(VECGEOM_ISAS sse2 sse3 ssse3 sse4.1 sse4.2 avx avx2 mic mic_avx512 native empty arch=nehalem arch=sandybridge  arch=haswell arch=skylake-avx512)
+-  set(VECGEOM_ISAS sse2 sse3 ssse3 sse4.1 sse4.2 avx avx2 native empty)
++  set(VECGEOM_ISAS sse2 sse3 ssse3 sse4.1 sse4.2 avx avx2 native empty arch=nehalem arch=sandybridge  arch=haswell arch=skylake-avx512)
  endif()
 
  enum_option(VECGEOM_VECTOR DOC "Vector instruction set to be used"

vecgeom.spec

@@ -1,18 +1,16 @@
-### RPM external vecgeom v1.1.8
+### RPM external vecgeom v1.1.16
 ## INCLUDE compilation_flags
-%define tag 5a275d77ef80b12240d59fd276231ad50d5df577
+%define tag ed9a40412c354652262ec80af449f5531206e52c
 Source: git+https://gitlab.cern.ch/VecGeom/VecGeom.git?obj=master/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}.tgz
 BuildRequires: cmake gmake
 %define keep_archives true
 
-Patch0: vecgeom-fix-for-arm64
-Patch1: vecgeom-fix-vector
+Patch0: vecgeom-fix-vector
 
 %prep
 %setup -n %{n}-%{realversion}
 
 %patch0 -p1
-%patch1 -p1
 
 %build
 rm -rf ../build