From 2f8be378f27901b16db96e9f0e37df2b93f5276d Mon Sep 17 00:00:00 2001
From: Andrey Popov <rainfinder@gmail.com>
Date: Sat, 27 Sep 2014 20:04:21 +0200
Subject: [PATCH] Update environment to run in SL6

---
 Makefile | 8 ++++----
 env.sh   | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index a0a4d67..43be1c9 100644
--- a/Makefile
+++ b/Makefile
@@ -9,11 +9,11 @@ endif
 ifeq ($(shell hostname | grep -q lxplus; echo $$?), 0)
   ifeq ($(BOOST_ROOT), )
     # Set the path to Boost appropriate for lxplus
-    BOOST_ROOT = /afs/cern.ch/sw/lcg/external/Boost/1.50.0_python2.7/x86_64-slc5-gcc46-opt
+    BOOST_ROOT = /afs/cern.ch/sw/lcg/external/Boost/1.55.0_python2.7/x86_64-slc6-gcc47-opt
   endif
   
-  BOOST_INCLUDE = $(BOOST_ROOT)/include/boost-1_50
-  BOOST_LIB_POSTFIX = -gcc46-mt-1_50
+  BOOST_INCLUDE = $(BOOST_ROOT)/include/boost-1_55
+  BOOST_LIB_POSTFIX = -gcc47-mt-1_55
 else
   ifeq ($(BOOST_ROOT), )
     $(error Mandatory environment variable BOOST_ROOT is not set)
@@ -30,7 +30,7 @@ BOOST_LIB = $(BOOST_ROOT)/lib
 CC = g++
 INCLUDE = -Icore/include -Iextensions/include -I$(shell root-config --incdir) -I$(BOOST_INCLUDE)
 OPFLAGS = -O2
-CFLAGS = -Wall -Wextra -fPIC -std=c++11 $(INCLUDE) $(OPFLAGS)
+CFLAGS = -Wall -Wextra -Wno-unused-local-typedefs -fPIC -std=c++11 $(INCLUDE) $(OPFLAGS)
 #LDFLAGS = $(shell root-config --libs) -lTreePlayer -lHistPainter \
 # -L$(BOOST_LIB) -lboost_filesystem$(BOOST_LIB_POSTFIX) $(PEC_FWK_INSTALL)/lib/libpecfwk.a \
 # -Wl,-rpath=$(BOOST_LIB)
diff --git a/env.sh b/env.sh
index 2d1da9b..fd3bb01 100755
--- a/env.sh
+++ b/env.sh
@@ -5,10 +5,10 @@ function set_environment
 {
     case $1 in
         "-r")
-        gcc_version="4.7.2"
-        source /afs/cern.ch/sw/lcg/external/gcc/$gcc_version/x86_64-slc5/setup.sh ""
-        root_version="5.34.09"
-        source /afs/cern.ch/sw/lcg/app/releases/ROOT/$root_version/x86_64-slc5-gcc46-opt/root/bin/thisroot.sh
+        gcc_version="4.9.1"
+        source /afs/cern.ch/sw/lcg/external/gcc/$gcc_version/x86_64-slc6/setup.sh ""
+        root_version="5.34.20"
+        source /afs/cern.ch/sw/lcg/app/releases/ROOT/$root_version/x86_64-slc6-gcc48-opt/root/bin/thisroot.sh
         #echo "GCC $gcc_version and ROOT $root_version are configured"
         ;;