[SCM] Gmsh packaging. Gmsh is an automatic 3D finite element mesh generator. branch, master, updated. debian/2.5.1_beta2_svn12143_dfsg-1-3-gd4a94fc

[Anton Gladky]

The following commit has been merged in the master branch:
commit 97cda718b75912a0bc8af0a7ecbe0d301e9b07fa
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Fri May 25 21:39:58 2012 +0200

    Disable MPI on armel armhf kfreebsd-amd64 kfreebsd-i386 mips mipsel. Hopefully will fix FTBFS on those platforms.

diff --git a/debian/rules b/debian/rules
index 1af9560..bd63c3d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,20 +6,31 @@ BUILDDIR = $(CURDIR)/debian/build
 
 export OMPI_MCA_plm_rsh_agent=/bin/false                #workaround to start MPI-applications in chroot
 
+disable_mpi_archs = armel armhf kfreebsd-amd64 kfreebsd-i386 mips mipsel
+
 extra_flags += \
--DCMAKE_CXX_FLAGS="-DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX -fopenmp -lmpi -fPIC \
-                   -Wall $(shell dpkg-buildflags --get CXXFLAGS)" \
 -DCMAKE_C_FLAGS="-fPIC -Wall $(shell dpkg-buildflags --get CFLAGS)" \
--DCMAKE_INCLUDE_PATH:STRING="/usr/include/mpi" \
--DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/python2.7 \
 -DPYTHON_INCLUDE_DIR:PATH=/usr/include/python2.7 \
 -DPYTHON_LIBRARY:FILEPATH=/usr/lib/libpython2.7.so \
 -DENABLE_METIS:BOOL=OFF \
 -DENABLE_TAUCS:BOOL=OFF \
--DENABLE_MPI:BOOL=ON \
 -DENABLE_OSMESA:BOOL=OFF \
 -DENABLE_CGNS:BOOL=OFF
 
+ifeq (,$(filter $(DEB_HOST_ARCH),$(disable_mpi_archs)))
+	extra_flags += \
+	-DCMAKE_CXX_FLAGS="-DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX -fopenmp -lmpi -fPIC \
+	                   -Wall $(shell dpkg-buildflags --get CXXFLAGS)" \
+	-DCMAKE_INCLUDE_PATH:STRING="/usr/include/mpi" \
+	-DENABLE_MPI:BOOL=ON
+else
+	extra_flags += \
+	-DCMAKE_CXX_FLAGS="-DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX -fopenmp -fPIC \
+	                   -Wall $(shell dpkg-buildflags --get CXXFLAGS)" \
+	-DCMAKE_INCLUDE_PATH:STRING="/usr/include/mpi" \
+	-DENABLE_MPI:BOOL=OFF
+endif
+
 # PETSC_DIR is the location of PETSc.
 export PETSC_DIR=/usr/lib/petscdir/3.2
 export PETSC_ARCH=linux-gnu-c-opt

-- 
Gmsh packaging. Gmsh is an automatic 3D finite element mesh generator.