From 6d9ae3f050572e4ff76e7a81935d8b06f50875f8 Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Mon, 18 Apr 2016 11:02:29 +0200 Subject: [PATCH 1/2] update redhat packaging - README file was renamed - use boost 1.48 only on rhel6. rhel7 supplies a newer boost by default. --- redhat/opm-core.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/redhat/opm-core.spec b/redhat/opm-core.spec index fd2aed7c..af6b2952 100644 --- a/redhat/opm-core.spec +++ b/redhat/opm-core.spec @@ -15,9 +15,9 @@ Source0: https://github.com/OPM/%{name}/archive/release/%{version}/%{tag} BuildRequires: blas-devel lapack-devel dune-common-devel BuildRequires: git suitesparse-devel doxygen bc opm-material-devel BuildRequires: tinyxml-devel dune-istl-devel ert.ecl-devel opm-common-devel -BuildRequires: opm-parser-devel opm-material-devel boost148-devel -%{?el6:BuildRequires: cmake28 devtoolset-2} -%{?!el6:BuildRequires: cmake gcc gcc-gfortran gcc-c++} +BuildRequires: opm-parser-devel opm-material-devel +%{?el6:BuildRequires: cmake28 devtoolset-2 boost148-devel} +%{?!el6:BuildRequires: cmake gcc gcc-gfortran gcc-c++ boost-devel} BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: libopm-core1 = %{version} @@ -66,7 +66,7 @@ This package contains the applications for opm-core # consider using -DUSE_VERSIONED_DIR=ON if backporting %build %{?el6:scl enable devtoolset-2 bash} -%{?el6:cmake28} %{!?el6:cmake} -DBUILD_SHARED_LIBS=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DSTRIP_DEBUGGING_SYMBOLS=ON -DCMAKE_INSTALL_PREFIX=%{_prefix} -DCMAKE_INSTALL_DOCDIR=share/doc/%{name}-%{version} -DUSE_RUNPATH=OFF %{?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} -DBOOST_LIBRARYDIR=%{_libdir}/boost148 -DBOOST_INCLUDEDIR=/usr/include/boost148 +%{?el6:cmake28} %{!?el6:cmake} -DBUILD_SHARED_LIBS=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DSTRIP_DEBUGGING_SYMBOLS=ON -DCMAKE_INSTALL_PREFIX=%{_prefix} -DCMAKE_INSTALL_DOCDIR=share/doc/%{name}-%{version} -DUSE_RUNPATH=OFF %{?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 -DBOOST_LIBRARYDIR=%{_libdir}/boost148 -DBOOST_INCLUDEDIR=%{_includedir}/boost148} make %install @@ -81,7 +81,7 @@ rm -rf %{buildroot} %postun -n libopm-core1 -p /sbin/ldconfig %files -%doc COPYING README +%doc COPYING README.md %files doc %{_docdir}/* From 34ee73473725e9423b2403c92c46da5224ea5ed5 Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Mon, 18 Apr 2016 11:02:56 +0200 Subject: [PATCH 2/2] update debian packaging - README file was renamed - build with MPI enabled and add related dependencies --- debian/control | 2 +- debian/docs | 2 +- debian/rules | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/debian/control b/debian/control index 2b241caf..8fd90bd8 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Build-Depends: build-essential, debhelper (>= 9), libboost-filesystem-dev, libert.ecl-dev, git, zlib1g-dev, libtool, doxygen, libopm-parser-dev, libopm-material-dev, texlive-latex-extra, texlive-latex-recommended, ghostscript, libboost-iostreams-dev, libopm-common-dev, - libopm-material-dev + libopm-material-dev, libopenmpi-dev, mpi-default-bin, libtrilinos-zoltan-dev Standards-Version: 3.9.2 Section: libs Homepage: http://opm-project.org diff --git a/debian/docs b/debian/docs index 1f562b30..7758d582 100644 --- a/debian/docs +++ b/debian/docs @@ -1,2 +1,2 @@ -README +README.md COPYING diff --git a/debian/rules b/debian/rules index f96f6557..cb299369 100755 --- a/debian/rules +++ b/debian/rules @@ -8,6 +8,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +export OMPI_MCA_plm_rsh_agent=/bin/false %: dh $@ @@ -20,7 +21,7 @@ override_dh_auto_build: # consider using -DUSE_VERSIONED_DIR=ON if backporting override_dh_auto_configure: - dh_auto_configure --buildsystem=cmake -- -DCMAKE_BUILD_TYPE=RelWithDebInfo -DSTRIP_DEBUGGING_SYMBOLS=ON -DBUILD_SHARED_LIBS=1 -DCMAKE_INSTALL_DOCDIR=share/doc/libopm-core1 -DWHOLE_PROG_OPTIM=ON -DUSE_RUNPATH=OFF + dh_auto_configure --buildsystem=cmake -- -DCMAKE_BUILD_TYPE=RelWithDebInfo -DUSE_MPI=1 -DSTRIP_DEBUGGING_SYMBOLS=ON -DBUILD_SHARED_LIBS=1 -DCMAKE_INSTALL_DOCDIR=share/doc/libopm-core1 -DWHOLE_PROG_OPTIM=ON -DUSE_RUNPATH=OFF override_dh_auto_install: dh_auto_install -- install-html