use devtoolset to build on rhel-6

f41
David Tardon 10 years ago
parent e97054c6c9
commit 9b1eb33b50

@ -131,6 +131,10 @@ BuildRequires: automake
BuildRequires: bc BuildRequires: bc
BuildRequires: binutils BuildRequires: binutils
BuildRequires: bison BuildRequires: bison
%if 0%{?rhel} && 0%{?rhel} < 7
BuildRequires: devtoolset-2-binutils
BuildRequires: devtoolset-2-gcc-c++
%endif
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: doxygen BuildRequires: doxygen
BuildRequires: findutils BuildRequires: findutils
@ -1221,8 +1225,11 @@ export CXXFLAGS=$ARCH_FLAGS
%if 0%{?rhel} %if 0%{?rhel}
%if 0%{?rhel} < 7 %if 0%{?rhel} < 7
%global devtoolset_path /opt/rh/devtoolset-2/root
# make segfaults on parallel build # 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 %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 %ifarch s390 s390x
%define archoptions --disable-sdremote-bluetooth %define archoptions --disable-sdremote-bluetooth

Loading…
Cancel
Save