From e356c6c77aafe71271d323c0f916888395f98d25 Mon Sep 17 00:00:00 2001 From: Mircho Rodozov Date: Wed, 20 Jan 2021 11:55:28 +0100 Subject: [PATCH] ROOT 6.22 - test TBB 2021.1.1 --- dd4hep.spec | 7 +++---- root.spec | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dd4hep.spec b/dd4hep.spec index 479614b7480..b95222c6caf 100644 --- a/dd4hep.spec +++ b/dd4hep.spec @@ -1,6 +1,6 @@ -### RPM external dd4hep v01-14x +### RPM external dd4hep v01-15x -%define tag 934ce101148be15cce7725caad8c25084a272938 +%define tag 12caacb209af70835dbdd48efa7ef8d0b77b3dcd %define branch master %define github_user AIDASoft %define keep_archives true @@ -23,8 +23,7 @@ CMAKE_ARGS="-DCMAKE_INSTALL_PREFIX='%{i}' \ -DDD4HEP_USE_PYROOT=ON \ -DCMAKE_CXX_STANDARD=17 \ -DCMAKE_BUILD_TYPE=Release \ - -DDD4HEP_USE_TBB=ON \ - -DCMAKE_PREFIX_PATH=${TBB_ROOT}/cmake/TBB;${CLHEP_ROOT};${XERCES_C_ROOT}" + -DCMAKE_PREFIX_PATH=${CLHEP_ROOT};${XERCES_C_ROOT}" #Build normal Shared D4Hep without Geant4 rm -rf ../build; mkdir ../build; cd ../build diff --git a/root.spec b/root.spec index 91ae0721445..414c0f6855f 100644 --- a/root.spec +++ b/root.spec @@ -3,8 +3,8 @@ ## INITENV +PATH PYTHON3PATH %{i}/lib ## INITENV SET ROOTSYS %{i} -%define tag 9496c05e656f9c18c83cce6658f9f8914eaf2244 -%define branch cms/v6-22-00-patches/v6-22-06 +%define tag fdb5b3b2ca669fe78f6293a55a77201180efa13a +%define branch cms/v6-22-00-patches/071a4c3 %define github_user cms-sw Source: git+https://github.com/%{github_user}/root.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}-%{tag}.tgz