[SCM] Gerris Flow Solver branch, debian-unstable, updated. gerris-20091109-dfsg.1-1-15-gc1377bf
Drew Parsons
dparsons at debian.org
Mon Dec 28 03:18:20 UTC 2009
The following commit has been merged in the debian-unstable branch:
commit 2785d3fbb3a80ca3ad1ee7a342689dc44586bd8e
Author: Drew Parsons <dparsons at debian.org>
Date: Sun Dec 27 22:48:19 2009 +1100
build with and without MPI support
with judicious use of "dh_auto_* --builddirectory"
Add mpi-default-dev as a build-dependency
diff --git a/debian/control b/debian/control
index eae72bf..497eaf8 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Drew Parsons <dparsons at debian.org>
Build-Depends: debhelper (>= 7), quilt (>= 0.46-7~), autotools-dev,
libgts-dev (>> 0.7.6), libgts-bin (>> 0.7.6),
libnetcdf-dev, libgsl0-dev, libglib2.0-dev, python,
- gfortran
+ gfortran, mpi-default-dev
Standards-Version: 3.8.3
Homepage: http://gfs.sourceforge.net/
Vcs-Git: git://git.debian.org/git/debian-science/packages/gerris.git
diff --git a/debian/rules b/debian/rules
index f7c42c5..a122f56 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,21 +13,36 @@ export DH_OPTIONS
# calling gfsview-batch2D, etc. So invoke nocheck (relevant to dh_auto_test)
export DEB_BUILD_OPTIONS=nocheck
+BUILDDIR=debian/build
+BUILDDIR_MPI=debian/build-mpi
+
# uses generic debhelper build
%:
dh --with quilt $@
override_dh_auto_configure:
- dh_auto_configure -- --disable-mpi
+ dh_auto_configure --builddirectory=$(BUILDDIR) -- --disable-mpi
+ dh_auto_configure --builddirectory=$(BUILDDIR_MPI) -- --enable-mpi
# some autogenerated files get left behind by upstream autotools clean
# so remove them here
override_dh_auto_clean:
- dh_auto_clean
- -rm doc/examples/gerris.dic
- -rm doc/examples/gfs.lang
- -rm src/modules.c
- -rm src/modules.h
+ dh_auto_clean --builddirectory=$(BUILDDIR)
+ dh_auto_clean --builddirectory=$(BUILDDIR_MPI)
+ for bdir in $(BUILDDIR) $(BUILDDIR_MPI); do \
+ rm $$bdir/doc/examples/gerris.dic || true; \
+ rm $$bdir/doc/examples/gfs.lang || true; \
+ rm $$bdir/src/modules.c || true; \
+ rm $$bdir/src/modules.h || true; \
+ done
+
+override_dh_auto_build:
+ dh_auto_build --builddirectory=$(BUILDDIR)
+ dh_auto_build --builddirectory=$(BUILDDIR_MPI)
+
+override_dh_auto_install:
+ dh_auto_install --builddirectory=$(BUILDDIR) --dest=debian/tmp
+ dh_auto_install --builddirectory=$(BUILDDIR_MPI) --dest=debian/tmp-mpi
# don't need to install darcs2dist or gfs2doc
# see bug#436240 for my opinion on the sensibleness of this
--
Gerris Flow Solver
More information about the debian-science-commits
mailing list