From d2ca8956c624ae42c772783e098226b80fe1ba34 Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <Frank.Winklmeier@cern.ch>
Date: Thu, 22 Oct 2015 13:11:54 +0200
Subject: [PATCH] Fix too long ROOT include path, add gcc49 (HLTUtils-01-02-14)
* python/hltOksUtils.py: Add gcc49 as additional platform
* share/make_hlt_env.py: reduce ROOT_INCLUDE_PATH to non-emtpy directories (ATR-12596)
* HLTUtils-01-02-14
---
HLT/HLTUtils/python/hltOksUtils.py | 4 +++-
HLT/HLTUtils/share/make_hlt_env.py | 5 +++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/HLT/HLTUtils/python/hltOksUtils.py b/HLT/HLTUtils/python/hltOksUtils.py
index 66cd32bc641..f714e8cd0d6 100644
--- a/HLT/HLTUtils/python/hltOksUtils.py
+++ b/HLT/HLTUtils/python/hltOksUtils.py
@@ -11,7 +11,9 @@ def defaultTags():
import pm.common
tags = [pm.common.tdaqRepository.getObject('Tag', 'x86_64-slc6-gcc48-opt'),
- pm.common.tdaqRepository.getObject('Tag', 'x86_64-slc6-gcc48-dbg')
+ pm.common.tdaqRepository.getObject('Tag', 'x86_64-slc6-gcc48-dbg'),
+ pm.common.tdaqRepository.getObject('Tag', 'x86_64-slc6-gcc49-opt'),
+ pm.common.tdaqRepository.getObject('Tag', 'x86_64-slc6-gcc49-dbg'),
]
return tags
diff --git a/HLT/HLTUtils/share/make_hlt_env.py b/HLT/HLTUtils/share/make_hlt_env.py
index d33ae104998..db63cf613b4 100755
--- a/HLT/HLTUtils/share/make_hlt_env.py
+++ b/HLT/HLTUtils/share/make_hlt_env.py
@@ -72,7 +72,8 @@ class Config:
'PYTHONPATH',
'DATAPATH',
'MANPATH',
- 'JOBOPTSEARCHPATH'
+ 'JOBOPTSEARCHPATH',
+ 'ROOT_INCLUDE_PATH',
]
# Possible description for OKS variables
@@ -202,7 +203,7 @@ def writeHltEnv(hltenv, filename, prefix):
Name = k,
Value = hltenv[k],
Description = Config.doc.get(k,''))
-
+
hltvars.Contains += [var]
for var,inc in Config.addVars.iteritems():
--
GitLab