[Pkg-scicomp-commits] gmsh/trunk/debian

Christophe Prud'homme prudhomm at debian.org
Fri Mar 20 07:22:40 UTC 2009


SVN commit 4291 by prudhomm:

enable mpi support on selected arch


 M  +3 -1      gmsh/trunk/debian/changelog  
 M  +3 -1      gmsh/trunk/debian/control  
 M  +17 -2     gmsh/trunk/debian/rules  


--- gmsh/trunk/debian/changelog #4290:4291
@@ -10,8 +10,10 @@
     algorithms.
   * debian/{control,rules}: Build with occ support only on amd64 and i386
   * debian/rules: find GMSH_VERSION automatically
+  * debian/{rules,control}: enable mpi support for amd64, i386, ia64 and
+    powerpc
 
- -- Christophe Prud'homme <prudhomm at debian.org>  Fri, 20 Mar 2009 07:48:29 +0100
+ -- Christophe Prud'homme <prudhomm at debian.org>  Fri, 20 Mar 2009 08:21:36 +0100
 
 gmsh (2.3.0.dfsg-3) unstable; urgency=low
 
--- gmsh/trunk/debian/control #4290:4291
@@ -6,7 +6,8 @@
 Build-Depends: debhelper (>= 7), quilt, cdbs, libgl1-mesa-dev|nvidia-glx-dev,
  libglu1-mesa-dev, libfltk1.1-dev (>=1.1.7), libgsl0-dev,
  libpng12-dev, libjpeg62-dev, zlib1g-dev, texlive, texinfo, 
- libopencascade-dev [i386 amd64]
+ libopencascade-dev [i386 amd64],
+ mpi-default-dev [i386 amd64 ia64 powerpc]
 Standards-Version: 3.8.1
 Vcs-Svn: svn://svn.debian.org/svn/pkg-scicomp/gmsh/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-scicomp/gmsh/
@@ -15,6 +16,7 @@
 Package: gmsh
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: mpi-default-bin
 Description:  three-dimensional finite element mesh generator
  Gmsh is an automatic 3D finite element mesh generator (primarily
  Delaunay) with build-in CAD and post-processing facilities. Its
--- gmsh/trunk/debian/rules #4290:4291
@@ -22,23 +22,37 @@
 #export CC=gcc-4.3
 #export CFLAGS= -O3 -I/usr/include/opencascade
 #export CXXFLAGS= -O3 -I/usr/include/opencascade
-export CFLAGS= -O3  -I/usr/include/mpi -DOMPI_SKIP_MPICXX 
-export CXXFLAGS= -O3 -I/usr/include/mpi -DOMPI_SKIP_MPICXX 
+export CFLAGS= -O3  
+export CXXFLAGS= -O3 
 export FFLAGS= -O3
 export CPPFLAGS=
 
 WITH_OCC=no
+WITH_MPI=no
 ifeq ($(shell dpkg --print-architecture),amd64)
  WITH_OCC=yes
+ WITH_MPI=yes
 endif
 ifeq ($(shell dpkg --print-architecture),i386)
  WITH_OCC=yes
+ WITH_MPI=yes
 endif
+ifeq ($(shell dpkg --print-architecture),ia64)
+ WITH_MPI=yes
+endif
+ifeq ($(shell dpkg --print-architecture),powerpc)
+ WITH_MPI=yes
+endif
 ifeq ($(WITH_OCC),yes)
  CFLAGS += -I/usr/include/opencascade -DHAVE_NO_OCC_CONFIG_H
  CXXFLAGS += -I/usr/include/opencascade -DHAVE_NO_OCC_CONFIG_H
  CPPFLAGS += -I/usr/include/opencascade -DHAVE_NO_OCC_CONFIG_H
 endif
+ifeq ($(WITH_MPI),yes)
+ CFLAGS += -I/usr/include/mpi -DOMPI_SKIP_MPICXX 
+ CXXFLAGS += -I/usr/include/mpi -DOMPI_SKIP_MPICXX 
+ CPPFLAGS += -I/usr/include/mpi -DOMPI_SKIP_MPICXX 
+endif
 
 DEB_CONFIGURE_EXTRA_FLAGS :=       \
   --host=$(DEB_HOST_GNU_TYPE)      \
@@ -48,6 +62,7 @@
   --infodir=\$${prefix}/share/info \
   $(ENABLE_MED)                    \
   --enable-occ=$(WITH_OCC)         \
+  --enable-mpi=$(WITH_MPI)         \
   --disable-metis --disable-tetgen
 
 



More information about the Pkg-scicomp-commits mailing list