OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1148 from akva2/update_packaging_2017.04

Browse Source 
Packaging updates backport
This commit is contained in:
Atgeirr Flø Rasmussen 2017-04-18 23:19:03 +02:00 committed by GitHub
commit 8a2ded5651
4 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debian/control vendored
View File

@ -7,10 +7,10 @@ Build-Depends: build-essential, debhelper (>= 9), libboost-filesystem-dev,
libdune-common-dev, libdune-istl-dev, cmake, libtinyxml-dev, bc, libdune-common-dev, libdune-istl-dev, cmake, libtinyxml-dev, bc,
libert.ecl-dev, git, zlib1g-dev, libtool, doxygen, libert.ecl-dev, git, zlib1g-dev, libtool, doxygen,
texlive-latex-extra, texlive-latex-recommended, ghostscript, texlive-latex-extra, texlive-latex-recommended, ghostscript,
libopm-core-dev, libopm-material-dev, libopm-core-dev, libopm-material-dev, libeigen3-dev,
libopm-parser-dev, libboost-iostreams-dev, libopm-common-dev, libopm-parser-dev, libboost-iostreams-dev, libopm-common-dev,
libopm-grid-dev, libdune-grid-dev, libug-dev, libopm-output-dev, libopm-grid-dev, libdune-grid-dev, libug-dev, libopm-output-dev,
libtrilinos-zoltan-dev, libopenmpi-dev, mpi-default-bin libtrilinos-zoltan-dev, libopenmpi-dev, mpi-default-bin, libewoms-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

17
debian/mk_orig_source vendored
View File

@ -1,17 +0,0 @@
#!/bin/bash
ORIGDIR=`pwd`
TOPDIR=`dirname $0`
tmp=`mktemp -d`
pushd .
cd $TOPDIR/..
git archive --prefix opm-simulators-$1/ -o $tmp/opm-simulators.tar.gz $2
cd $tmp
wget https://github.com/OPM/eigen3/archive/master.tar.gz -O eigen3-master.tar.gz
tar zxvf opm-simulators.tar.gz
cd opm-simulators-$1
tar zxvf ../eigen3-master.tar.gz
cd ..
tar zcvf $ORIGDIR/opm-simulators-$1.tar.gz opm-simulators-$1/
popd
rm $tmp -Rf

5
debian/rules vendored
View File

@ -21,10 +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:
mkdir build-eigen dh_auto_configure --buildsystem=cmake -- -DCMAKE_BUILD_TYPE=Release -DUSE_MPI=1 -DBUILD_SHARED_LIBS=1 -DCMAKE_INSTALL_DOCDIR=share/doc/libopm-simulators1 -DWHOLE_PROG_OPTIM=OFF -DUSE_RUNPATH=OFF
cd build-eigen && cmake $(CURDIR)/eigen3-master -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/tmp/install-eigen3
cd build-eigen && make install
dh_auto_configure --buildsystem=cmake -- -DCMAKE_BUILD_TYPE=Release -DUSE_MPI=1 -DBUILD_SHARED_LIBS=1 -DCMAKE_INSTALL_DOCDIR=share/doc/libopm-simulators1 -DWHOLE_PROG_OPTIM=OFF -DUSE_RUNPATH=OFF -DCMAKE_PREFIX_PATH=/tmp/install-eigen3
override_dh_auto_install: override_dh_auto_install:
dh_auto_install -- install-html dh_auto_install -- install-html

2
redhat/opm-simulators.spec
View File

@ -15,7 +15,7 @@ Source0: https://github.com/OPM/%{name}/archive/release/%{version}/%{tag}
BuildRequires: blas-devel lapack-devel dune-common-devel opm-output-devel BuildRequires: blas-devel lapack-devel dune-common-devel opm-output-devel
BuildRequires: git suitesparse-devel doxygen bc BuildRequires: git suitesparse-devel doxygen bc
BuildRequires: opm-parser-devel opm-core-devel opm-grid-devel BuildRequires: opm-parser-devel opm-core-devel opm-grid-devel
BuildRequires: tinyxml-devel dune-istl-devel eigen3-devel ert.ecl-devel BuildRequires: tinyxml-devel dune-istl-devel eigen3-devel ert.ecl-devel ewoms-devel
%{?el6:BuildRequires: cmake28 devtoolset-3-toolchain boost148-devel} %{?el6:BuildRequires: cmake28 devtoolset-3-toolchain boost148-devel}
%{!?el6:BuildRequires: cmake gcc gcc-c++ boost-devel} %{!?el6:BuildRequires: cmake gcc gcc-c++ boost-devel}
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build