OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1000 from akva2/updates_for_16.04_packaging

Browse Source 
Updates for 16.04 packaging
This commit is contained in:
Atgeirr Flø Rasmussen 2016-04-18 11:13:13 +02:00
commit b07f4dd494
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/control vendored
View File

@ -8,7 +8,7 @@ Build-Depends: build-essential, debhelper (>= 9), libboost-filesystem-dev,
libert.ecl-dev, git, zlib1g-dev, libtool, doxygen, libopm-parser-dev, libert.ecl-dev, git, zlib1g-dev, libtool, doxygen, libopm-parser-dev,
libopm-material-dev, texlive-latex-extra, texlive-latex-recommended, libopm-material-dev, texlive-latex-extra, texlive-latex-recommended,
ghostscript, libboost-iostreams-dev, libopm-common-dev, 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 Standards-Version: 3.9.2
Section: libs Section: libs
Homepage: http://opm-project.org Homepage: http://opm-project.org

2
debian/docs vendored
View File

@ -1,2 +1,2 @@
README README.md
COPYING COPYING

3
debian/rules vendored
View File

@ -8,6 +8,7 @@
# Uncomment this to turn on verbose mode. # Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1 #export DH_VERBOSE=1
export OMPI_MCA_plm_rsh_agent=/bin/false
%: %:
dh $@ dh $@
@ -20,7 +21,7 @@ override_dh_auto_build:
# consider using -DUSE_VERSIONED_DIR=ON if backporting # consider using -DUSE_VERSIONED_DIR=ON if backporting
override_dh_auto_configure: 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: override_dh_auto_install:
dh_auto_install -- install-html dh_auto_install -- install-html

10
redhat/opm-core.spec
View File

@ -15,9 +15,9 @@ Source0: https://github.com/OPM/%{name}/archive/release/%{version}/%{tag}
BuildRequires: blas-devel lapack-devel dune-common-devel BuildRequires: blas-devel lapack-devel dune-common-devel
BuildRequires: git suitesparse-devel doxygen bc opm-material-devel BuildRequires: git suitesparse-devel doxygen bc opm-material-devel
BuildRequires: tinyxml-devel dune-istl-devel ert.ecl-devel opm-common-devel BuildRequires: tinyxml-devel dune-istl-devel ert.ecl-devel opm-common-devel
BuildRequires: opm-parser-devel opm-material-devel boost148-devel BuildRequires: opm-parser-devel opm-material-devel
%{?el6:BuildRequires: cmake28 devtoolset-2} %{?el6:BuildRequires: cmake28 devtoolset-2 boost148-devel}
%{?!el6:BuildRequires: cmake gcc gcc-gfortran gcc-c++} %{?!el6:BuildRequires: cmake gcc gcc-gfortran gcc-c++ boost-devel}
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: libopm-core1 = %{version} Requires: libopm-core1 = %{version}
@ -66,7 +66,7 @@ This package contains the applications for opm-core
# consider using -DUSE_VERSIONED_DIR=ON if backporting # consider using -DUSE_VERSIONED_DIR=ON if backporting
%build %build
%{?el6:scl enable devtoolset-2 bash} %{?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 make
%install %install
@ -81,7 +81,7 @@ rm -rf %{buildroot}
%postun -n libopm-core1 -p /sbin/ldconfig %postun -n libopm-core1 -p /sbin/ldconfig
%files %files
%doc COPYING README %doc COPYING README.md
%files doc %files doc
%{_docdir}/* %{_docdir}/*