changed: disable ecl3 in packaging

matteodg · Jun 18, 2019 · e906caa · e906caa
1 parent 3db8743
commit e906caa
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/debian/rules b/debian/rules
@@ -19,7 +19,7 @@ override_dh_auto_build:
 	dh_auto_build --buildsystem=cmake
 
 override_dh_auto_configure:
-	DESTDIR=$$(pwd)/debian/tmp dh_auto_configure --buildsystem=cmake -- -DBUILD_SHARED_LIBS=1 -DBUILD_ECL_SUMMARY=1 -DENABLE_PYTHON=1 -DCMAKE_BUILD_TYPE=Release
+	DESTDIR=$$(pwd)/debian/tmp dh_auto_configure --buildsystem=cmake -- -DBUILD_SHARED_LIBS=1 -DBUILD_ECL_SUMMARY=1 -DENABLE_PYTHON=1 -DCMAKE_BUILD_TYPE=Release -DBUILD_ECL3=0
 
 override_dh_auto_install:
 	dh_auto_install --buildsystem=cmake
diff --git a/redhat/ecl.spec b/redhat/ecl.spec
@@ -13,10 +13,8 @@ Group:          Development/Libraries/C and C++
 Url:            http://ert.nr.no
 Source0:        https://github.com/Equinor/libecl/archive/release/%{version}/%{tag}.tar.gz#/%{name}-%{version}.tar.gz
 BuildRequires:  lapack-devel zlib-devel iputils
-BuildRequires:  devtoolset-6-toolchain
+BuildRequires:  devtoolset-6-toolchain cmake3
 %{?!el6:BuildRequires: python-devel numpy python-pandas python-cwrap}
-%{?el6:BuildRequires:  cmake3}
-%{?!el6:BuildRequires:  cmake}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires:       libecl1 = %{version}
 
@@ -55,7 +53,7 @@ This package contains the development and header files for ecl
 
 %build
 scl enable devtoolset-6 bash
-DESTDIR=${RPM_BUILD_ROOT} %{?el6:cmake3} %{?!el6:cmake} -DBUILD_SHARED_LIBS=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=%{_prefix} -DBUILD_ECL_SUMMARY=1 %{?el6:-DENABLE_PYTHON=0} %{?!el6:-DENABLE_PYTHON=1} -DCMAKE_CXX_COMPILER=/opt/rh/devtoolset-6/root/usr/bin/g++ -DCMAKE_C_COMPILER=/opt/rh/devtoolset-6/root/usr/bin/gcc -DCMAKE_Fortran_COMPILER=/opt/rh/devtoolset-6/root/usr/bin/gfortran
+DESTDIR=${RPM_BUILD_ROOT} cmake3 -DBUILD_SHARED_LIBS=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=%{_prefix} -DBUILD_ECL_SUMMARY=1 %{?el6:-DENABLE_PYTHON=0} %{?!el6:-DENABLE_PYTHON=1} -DCMAKE_CXX_COMPILER=/opt/rh/devtoolset-6/root/usr/bin/g++ -DCMAKE_C_COMPILER=/opt/rh/devtoolset-6/root/usr/bin/gcc -DCMAKE_Fortran_COMPILER=/opt/rh/devtoolset-6/root/usr/bin/gfortran -DBUILD_ECL3=0
 make
 
 %install