diff --git a/dd4hep.spec b/dd4hep.spec index 221528ea44f..e50b0471c0a 100644 --- a/dd4hep.spec +++ b/dd4hep.spec @@ -1,5 +1,5 @@ -### RPM external dd4hep v01-29-00 -%define tag d119e3f8f5da75bd87632467df088197f84ed1b8 +### RPM external dd4hep v01-32-1x +%define tag 23ceda5b6460ba72b137134223708713a0f2a223 %define branch master %define github_user AIDASoft diff --git a/root.spec b/root.spec index a5784445aca..fb8bb19642f 100644 --- a/root.spec +++ b/root.spec @@ -1,10 +1,10 @@ -### RPM lcg root 6.32.13 +### RPM lcg root 6.37.1 ## INITENV +PATH PYTHON3PATH %{i}/lib ## INITENV SET ROOTSYS %{i} ## INCLUDE compilation_flags ## INCLUDE cpp-standard -%define tag 63c27767f1be350ef3d684242da34f0d396cf97d -%define branch cms/v6-32-00-patches/69384a6a78 +%define tag cde673346344ce5f48153a034abd2538902868e0 +%define branch cms/master/a9a81f1271 %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 @@ -36,8 +36,8 @@ rm -rf ../build mkdir ../build cd ../build -export CFLAGS=-D__ROOFIT_NOBANNER -export CXXFLAGS=-D__ROOFIT_NOBANNER +export CFLAGS="-D__ROOFIT_NOBANNER" +export CXXFLAGS="-D__ROOFIT_NOBANNER -DROOT_DISABLE_TCLASS_GET_CLASS_AUTOPARSING" %if "%{?arch_build_flags}" export CFLAGS="${CFLAGS} %{arch_build_flags}" export CXXFLAGS="${CXXFLAGS} %{arch_build_flags}" @@ -90,7 +90,6 @@ cmake ../%{n}-%{realversion} \ -Dbuiltin_glew=ON \ -Dbuiltin_ftgl=ON \ -Dbuiltin_gl2ps=ON \ - -Dbuiltin_afterimage=ON \ -Dbuiltin_xxhash=ON \ -Dbuiltin_nlohmannjson=ON \ -Darrow=OFF \ @@ -111,8 +110,8 @@ cmake ../%{n}-%{realversion} \ -DDCAP_INCLUDE_DIR="${DCAP_ROOT}/include" \ -DDCAP_DIR="${DCAP_ROOT}" \ %endif - -DCMAKE_C_FLAGS="-D__ROOFIT_NOBANNER" \ - -DCMAKE_C_FLAGS="-D__ROOFIT_NOBANNER" \ + -DCMAKE_C_FLAGS="${CFLAGS}" \ + -DCMAKE_CXX_FLAGS="${CXXFLAGS}" \ -Dgviz=OFF \ -Dbonjour=OFF \ -Dodbc=OFF \ @@ -128,7 +127,6 @@ cmake ../%{n}-%{realversion} \ -Dalien=OFF \ -Dmonalisa=OFF \ %ifarch darwin - -Dbuiltin_afterimage=OFF \ -Dcocoa=OFF \ -Dx11=ON \ -Dcastor=OFF \