From 70602d0e5c0907cbb645f0d49fe33581261fe7e3 Mon Sep 17 00:00:00 2001 From: Ivan Razumov Date: Wed, 29 Jan 2025 09:23:43 +0100 Subject: [PATCH 1/3] Updated root to tip of branch master --- root.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/root.spec b/root.spec index 8ac571b3b06..4b7dd6b9ecb 100644 --- a/root.spec +++ b/root.spec @@ -3,8 +3,8 @@ ## INITENV SET ROOTSYS %{i} ## INCLUDE compilation_flags ## INCLUDE cpp-standard -%define tag 6832ba158b58e9149a174f16fa29b04409a8c4ac -%define branch cms/master/de95c5e48d +%define tag 3d0f75672decc6e3fd7e026ada3210674271a917 +%define branch cms/master/848052ea02 %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 223f9951db017fd18c594c066651c6f319cb9278 Mon Sep 17 00:00:00 2001 From: Malik Shahzad Muzaffar Date: Mon, 3 Feb 2025 07:43:03 +0100 Subject: [PATCH 2/3] do not merge: build root in debug mode --- root.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root.spec b/root.spec index 4b7dd6b9ecb..c0b4333d05f 100644 --- a/root.spec +++ b/root.spec @@ -44,7 +44,7 @@ export CXXFLAGS="${CXXFLAGS} %{arch_build_flags}" cmake ../%{n}-%{realversion} \ -G Ninja \ - -DCMAKE_BUILD_TYPE=%{cmake_build_type} \ + -DCMAKE_BUILD_TYPE=Debug \ %if %{is_debug_build root/llvm} -DLLVM_BUILD_TYPE=Debug \ %else From 1d30452ac38e528d49d6b6732c0449faaca0693b Mon Sep 17 00:00:00 2001 From: Malik Shahzad Muzaffar Date: Mon, 3 Feb 2025 17:08:36 +0100 Subject: [PATCH 3/3] get oot master latest changes --- root.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/root.spec b/root.spec index c0b4333d05f..e5139cb004d 100644 --- a/root.spec +++ b/root.spec @@ -3,8 +3,8 @@ ## INITENV SET ROOTSYS %{i} ## INCLUDE compilation_flags ## INCLUDE cpp-standard -%define tag 3d0f75672decc6e3fd7e026ada3210674271a917 -%define branch cms/master/848052ea02 +%define tag 7a598c52dad8a78d6196a8ecac37f3e3999c8693 +%define branch cms/master/8b3840f73b %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