diff --git a/root-avoid-race-condition-tutorial-roofit-rf512.patch b/root-avoid-race-condition-tutorial-roofit-rf512.patch new file mode 100644 index 0000000..d0c40e8 --- /dev/null +++ b/root-avoid-race-condition-tutorial-roofit-rf512.patch @@ -0,0 +1,50 @@ +From 91de99623d0e945610be46d46e84b54985415aeb Mon Sep 17 00:00:00 2001 +From: Mattias Ellert +Date: Fri, 28 Oct 2022 06:27:10 +0200 +Subject: [PATCH] Avoid race condition between + tutorial/roofit/rf512_wsfactory_oper.C and + tutorial/roofit/rf512_wsfactory_oper.py + +When run in parallel they delete eachother's files: + +cc1plus: fatal error: /builddir/build/BUILD/root-6.26.08/redhat-linux-build/runtutorials/RooCFAuto000Pdf_cxx_ACLiC_dict.cxx: No such file or directory +compilation terminated. +/usr/bin/ld: cannot find /builddir/build/BUILD/root-6.26.08/redhat-linux-build/runtutorials/RooCFAuto000Pdf_cxx_ACLiC_dict.o: No such file or directory +collect2: error: ld returned 1 exit status +--- + tutorials/CMakeLists.txt | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/tutorials/CMakeLists.txt b/tutorials/CMakeLists.txt +index cfba4d3ed9..6ae9be5869 100644 +--- a/tutorials/CMakeLists.txt ++++ b/tutorials/CMakeLists.txt +@@ -483,7 +483,7 @@ set(hist-hbars-depends tutorial-tree-cernbuild) + set(benchmarks-depends tutorial-hsimple + tutorial-fit-fit1 + tutorial-fit-myfit +- tutorial-hist-h1ReadAndDraw ++ tutorial-hist-h1ReadAndDraw + tutorial-hist-FirstContour + tutorial-geom-na49view + tutorial-tree-ntuple1 +@@ -731,7 +731,7 @@ if(ROOT_pyroot_FOUND) + set(pyroot-benchmarks-depends tutorial-pyroot-hsimple-py + tutorial-pyroot-fit1-py + tutorial-pyroot-na49view-py +- tutorial-pyroot-h1ReadAndDraw-py ++ tutorial-pyroot-h1ReadAndDraw-py + tutorial-pyroot-ntuple1-py) + set(pyroot-fit1-depends tutorial-pyroot-fillrandom-py) + set(pyroot-na49view-depends tutorial-pyroot-geometry-py) +@@ -739,6 +739,7 @@ if(ROOT_pyroot_FOUND) + + # Avoid a race condition: make sure Python tutorial is ran after C++ tutorial + set(roofit-rf104_classfactory-depends tutorial-roofit-rf104_classfactory) ++ set(roofit-rf512_wsfactory_oper-depends tutorial-roofit-rf512_wsfactory_oper) + + #---------------------------------------------------------------------- + # List requirements for python tutorials. +-- +2.37.3 + diff --git a/root.spec b/root.spec index 85e9a9b..26a7f25 100644 --- a/root.spec +++ b/root.spec @@ -65,7 +65,7 @@ Name: root Version: 6.26.08 %global libversion %(cut -d. -f 1-2 <<< %{version}) -Release: 1%{?dist} +Release: 2%{?dist} Summary: Numerical data analysis framework License: LGPLv2+ @@ -181,6 +181,9 @@ Patch34: %{name}-threadsh1-avoid-heap-use-after-free.patch Patch35: %{name}-PyROOT-code.h-must-not-be-included-directly-in-3.11.patch Patch36: %{name}-PyROOT-Prevent-cast-error-when-calling-PyTuple_SET_I.patch Patch37: %{name}-Guard-gInterpreterMutex-in-TClingClassInfo-IsEnum.patch +# Avoid race condition between C++ an Python version of test +# https://github.com/root-project/root/pull/11643 +Patch38: %{name}-avoid-race-condition-tutorial-roofit-rf512.patch %if %{?rhel}%{!?rhel:0} == 7 BuildRequires: devtoolset-8-toolchain @@ -2047,6 +2050,7 @@ This package contains an ntuple extension for ROOT 7. %patch35 -p1 %patch36 -p1 %patch37 -p1 +%patch38 -p1 # Remove bundled sources in order to be sure they are not used # * afterimage @@ -3983,6 +3987,9 @@ fi %endif %changelog +* Fri Oct 28 2022 Mattias Ellert - 6.26.08-2 +- Avoid race condition between C++ and Python version of a roofit test + * Wed Oct 19 2022 Mattias Ellert - 6.26.08-1 - Update to 6.26.08 - Drop patch root-move-private-decl.patch (fixed upstream)