dtardon pushed to libreoffice (f22). "use devtoolset to build on rhel-6"

[notifications at fedoraproject.org]

From 1ae90fa22dc32c73948408931ec07f16e710cafa Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon at redhat.com>
Date: Fri, 15 May 2015 13:44:58 +0200
Subject: use devtoolset to build on rhel-6


diff --git a/libreoffice.spec b/libreoffice.spec
index a747a97..f171513 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -133,6 +133,8 @@ BuildRequires: binutils
 BuildRequires: bison
 %if 0%{?rhel} && 0%{?rhel} < 7
 BuildRequires: chrpath
+BuildRequires: devtoolset-2-binutils
+BuildRequires: devtoolset-2-gcc-c++
 %endif
 BuildRequires: desktop-file-utils
 BuildRequires: doxygen
@@ -1239,8 +1241,11 @@ export CXXFLAGS=$ARCH_FLAGS
 
 %if 0%{?rhel}
 %if 0%{?rhel} < 7
+%global devtoolset_path /opt/rh/devtoolset-2/root
 # make segfaults on parallel build
 %define distrooptions --disable-eot --disable-gltf --disable-firebird-sdbc --disable-graphite --without-junit --enable-gstreamer-0-10 --disable-gstreamer-1.0 --disable-postgresql-sdbc --enable-python=system --with-system-hsqldb --without-doxygen --with-parallelism=-j1
+export PATH=%{devtoolset_path}%{_bindir}:$PATH
+export LD_LIBRARY_PATH=%{devtoolset_path}%{_libdir}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
 
 %ifarch s390 s390x
 %define archoptions --disable-sdremote-bluetooth
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/libreoffice.git/commit/?h=f22&id=1ae90fa22dc32c73948408931ec07f16e710cafa