From 6877dc272a165ae0e337a4922792c40188ebf343 Mon Sep 17 00:00:00 2001 From: Mircho Rodozov Date: Tue, 20 Oct 2020 19:28:56 +0200 Subject: [PATCH 1/2] [Geant4] Update to version 10.6.9 please test lets hope this will be sufficient --- geant4.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/geant4.spec b/geant4.spec index 5b66588f520..d2edfeea46b 100644 --- a/geant4.spec +++ b/geant4.spec @@ -1,7 +1,7 @@ -### RPM external geant4 10.7.0.beta -%define tag 67ba86d073ec6366df0de75a0f5b5d57920d0b7e -%define branch master -%define github_user Geant4 +### RPM external geant4 10.6.9 +%define tag e8eb2b9a2c3c1f1e76008177e65c612f27cbdba4 +%define branch cms/v%{realversion} +%define github_user cms-externals Source: git+https://github.com/%github_user/%{n}.git?obj=%{branch}/%{tag}&export=%{n}.%{realversion}&output=/%{n}.%{realversion}-%{tag}.tgz BuildRequires: cmake gmake From 102b160942b3224183f40cf1c83c9a7b1af020e4 Mon Sep 17 00:00:00 2001 From: Mircho Rodozov Date: Wed, 21 Oct 2020 10:35:26 +0200 Subject: [PATCH 2/2] Update vector and arm patches --- vecgeom-fix-for-arm64.patch | 4 ++-- vecgeom-fix-vector.patch | 16 ++++++++-------- vecgeom.spec | 4 +++- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/vecgeom-fix-for-arm64.patch b/vecgeom-fix-for-arm64.patch index 31ad10e8afe..1f290d6b668 100644 --- a/vecgeom-fix-for-arm64.patch +++ b/vecgeom-fix-for-arm64.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index b3014e9..f10fae0 100644 +index a090c57..9726ebe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -317,6 +317,8 @@ elseif(Intel) +@@ -294,6 +294,8 @@ elseif(Intel) list(APPEND CMAKE_CXX_FLAGS -std=c++11) elseif(CMAKE_CXX_STANDARD STREQUAL 14) list(APPEND CMAKE_CXX_FLAGS -std=c++14) diff --git a/vecgeom-fix-vector.patch b/vecgeom-fix-vector.patch index 8911b8d6270..b201773a96c 100644 --- a/vecgeom-fix-vector.patch +++ b/vecgeom-fix-vector.patch @@ -1,13 +1,13 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6f5833f..d4bfd51 100644 +index a090c57..7dbb121 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -80,7 +80,7 @@ option(USE_CACHED_TRANSFORMATIONS "Use cached transformations in navigation stat - option(FAST_MATH "Enable the -ffast-math compiler option in Release builds" OFF) - +@@ -85,7 +85,7 @@ endif() + # - ISA + set(VECGEOM_ISAS empty) if(CMAKE_SYSTEM_PROCESSOR MATCHES "(i686|x86_64)") -- set(VECGEOM_ARCH sse2 sse3 ssse3 sse4.1 sse4.2 avx avx2 mic mic_avx512 native empty) -+ set(VECGEOM_ARCH sse2 sse3 ssse3 sse4.1 sse4.2 avx avx2 mic mic_avx512 native empty arch=nehalem arch=sandybridge arch=haswell) - else() - set(VECGEOM_ARCH empty) +- 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) endif() + + enum_option(VECGEOM_VECTOR DOC "Vector instruction set to be used" diff --git a/vecgeom.spec b/vecgeom.spec index b58d1632fcb..f797d94dd8d 100644 --- a/vecgeom.spec +++ b/vecgeom.spec @@ -1,5 +1,7 @@ ### RPM external vecgeom v1.1.7 -Source: git+https://gitlab.cern.ch/VecGeom/VecGeom.git?obj=master/%{realversion}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}.tgz +%define tag 982503b232bb2101a5257630335340fbd3eb9f78 +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