From f8246b3022de582c00573da5fb18910b75e9c460 Mon Sep 17 00:00:00 2001 From: David Date: Mon, 29 Jun 2020 15:15:01 +0200 Subject: [PATCH] try root patch that is expected to fix current modules IB failures --- root.spec | 6 +----- root_alloc_traits.patch | 13 +++++++++++++ 2 files changed, 14 insertions(+), 5 deletions(-) create mode 100644 root_alloc_traits.patch diff --git a/root.spec b/root.spec index e69f77d5a89..8606bca30cd 100644 --- a/root.spec +++ b/root.spec @@ -8,11 +8,7 @@ %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 Patch0: root_lazy - - - - - +Patch1: root_alloc_traits %define islinux %(case %{cmsos} in (slc*|fc*) echo 1 ;; (*) echo 0 ;; esac) %define isdarwin %(case %{cmsos} in (osx*) echo 1 ;; (*) echo 0 ;; esac) diff --git a/root_alloc_traits.patch b/root_alloc_traits.patch new file mode 100644 index 00000000000..5ec2003fc77 --- /dev/null +++ b/root_alloc_traits.patch @@ -0,0 +1,13 @@ +diff --git a/interpreter/cling/include/cling/std.modulemap b/interpreter/cling/include/cling/std.modulemap +index 6b9acf1..81700c8 100644 +--- a/interpreter/cling/include/cling/std.modulemap ++++ b/interpreter/cling/include/cling/std.modulemap +@@ -429,4 +429,8 @@ module "std" [system] { + export * + header "bits/stl_tree.h" + } ++ module "ext/alloc_traits" { ++ export * ++ header "ext/alloc_traits.h" ++ } + }