Skip to content

Commit 81f9c0d

Browse files
committed
update rh6 packaging
compiling ert trips a bug in the devtoolset-2 toolchain. the compiler emits assembly not understood by the assembler (devtoolset-2 uses the default system assembler). instead of fighting this, simply upgrade toolchain.
1 parent da3356c commit 81f9c0d

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

redhat/ert.ecl.spec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Source0: https://github.com/OPM/%{name}/archive/release/%{version}/%{tag}
1515
BuildRequires: lapack-devel zlib-devel iputils
1616
BuildRequires: gcc
1717
%{?!el6:BuildRequires: python-devel numpy}
18-
%{?el6:BuildRequires: cmake28 devtoolset-2}
18+
%{?el6:BuildRequires: cmake28 devtoolset-3-toolchain}
1919
%{?!el6:BuildRequires: cmake}
2020
BuildRoot: %{_tmppath}/%{name}-%{version}-build
2121
Requires: libert.ecl1 = %{version}
@@ -70,8 +70,8 @@ This package contains the development and header files for ert.ecl
7070
%setup -q -n ert-release-%{version}-%{tag}
7171

7272
%build
73-
%{?el6:scl enable devtoolset-2 bash}
74-
DESTDIR=${RPM_BUILD_ROOT} %{?el6:cmake28} %{?!el6:cmake} -DBUILD_SHARED_LIBS=1 -DCMAKE_BUILD_TYPE=%{?el6:Debug}%{?!el6:Release} -DCMAKE_INSTALL_PREFIX=%{_prefix} -DBUILD_ECL_SUMMARY=1 %{?el6:-DBUILD_PYTHON=0} %{?el6:-DCMAKE_CXX_COMPILER=/opt/rh/devtoolset-2/root/usr/bin/g++ -DCMAKE_C_COMPILER=/opt/rh/devtoolset-2/root/usr/bin/gcc -DCMAKE_Fortran_COMPILER=/opt/rh/devtoolset-2/root/usr/bin/gfortran}
73+
%{?el6:scl enable devtoolset-3 bash}
74+
DESTDIR=${RPM_BUILD_ROOT} %{?el6:cmake28} %{?!el6:cmake} -DBUILD_SHARED_LIBS=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=%{_prefix} -DBUILD_ECL_SUMMARY=1 %{?el6:-DBUILD_PYTHON=0} %{?el6:-DCMAKE_CXX_COMPILER=/opt/rh/devtoolset-3/root/usr/bin/g++ -DCMAKE_C_COMPILER=/opt/rh/devtoolset-3/root/usr/bin/gcc -DCMAKE_Fortran_COMPILER=/opt/rh/devtoolset-3/root/usr/bin/gfortran}
7575
make
7676

7777
%install

0 commit comments

Comments
 (0)