From ba9800df910cfffc49b4808f4a00041f27b29d79 Mon Sep 17 00:00:00 2001 From: Mircho Rodozov Date: Fri, 20 Nov 2020 13:24:00 +0100 Subject: [PATCH 1/2] Updated root to tip of branch v6-22-00-patches --- root.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/root.spec b/root.spec index 727dfdbba20..7f3a7ada818 100644 --- a/root.spec +++ b/root.spec @@ -3,8 +3,8 @@ ## INITENV +PATH PYTHON3PATH %{i}/lib ## INITENV SET ROOTSYS %{i} -%define tag 1f88378efc1d646a98fd465d74acc917daa79d0e -%define branch cms/v6-22-00-patches/f683b71 +%define tag e3772da1070fd333fe42eac4f347d7234e4080d0 +%define branch cms/v6-22-00-patches/2136589 %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 From fbaa04e6b60e6a397db9cf2e986d5fa1af062628 Mon Sep 17 00:00:00 2001 From: Mircho Rodozov Date: Fri, 20 Nov 2020 16:47:41 +0200 Subject: [PATCH 2/2] Add standard cmake debug flags tested, the cmake config shows this -- Build Type: Debug (flags = '-g -O0') -- Compiler Flags: -g -O0 -D__ROOFIT_NOBANNER -std=c++17 -Wno-implicit-fallthrough -Wno-noexcept-type -pipe -Wshadow -Wall -W -Woverloaded-virtual -fsigned-char -pthread --- root.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/root.spec b/root.spec index 7f3a7ada818..e51801f4d61 100644 --- a/root.spec +++ b/root.spec @@ -42,6 +42,8 @@ cmake ../%{n}-%{realversion} \ -G Ninja \ -DCMAKE_BUILD_TYPE=Debug \ -DLLVM_BUILD_TYPE=Release \ + -DCMAKE_C_FLAGS_DEBUG="-g -O0" \ + -DCMAKE_CXX_FLAGS_DEBUG="-g -O0" \ -DCMAKE_INSTALL_PREFIX="%{i}" \ -DCMAKE_C_COMPILER=gcc \ -DCMAKE_CXX_COMPILER=g++ \