[SCM] Packaging for getfem++ branch, master, updated. upstream/4.1.1-17-g63742cb

[Anton Gladky]

The following commit has been merged in the master branch:
commit efa5204102038c11d70e69bed7ca4bfcfc1d5803
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Mon Jan 30 22:07:30 2012 +0100

    Disable mumps on s390x, because libmumps-seq-dev does not persist on this platform.

diff --git a/debian/TODO b/debian/TODO
index b0665c9..a3b4e2d 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -1 +1,2 @@
-* enable muparser, when libmuparser-dev appears on hurd-i386 platform
+* enable muparser on hurd-i386, when libmuparser-dev appears on this platform.
+* enable mumps on s390x, when libmumps-seq-dev appears on this platform.
diff --git a/debian/control b/debian/control
index b723612..557b7c4 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Konstantinos Poulios <poulios.konstantinos at gmail.com>,
 Build-Depends: debhelper (>= 9),
     autotools-dev, libtool, automake, autoconf,
     libblas-dev, libboost-dev, libqhull-dev,
-    libsuperlu3-dev, libmumps-seq-dev, libmuparser-dev [!hurd-i386],
+    libsuperlu3-dev, libmumps-seq-dev [!s390x], libmuparser-dev [!hurd-i386],
     python-numpy, python-scipy, python-all-dev, python-support (>= 1.0.4),
     scilab-include  [!mips !kfreebsd-amd64 !kfreebsd-i386],
     scilab [!mips !kfreebsd-amd64 !kfreebsd-i386]
diff --git a/debian/rules b/debian/rules
index 6c48b14..ee8d09f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,7 +23,6 @@ configure_flags= $(CROSS) --prefix=/usr \
 		--enable-boost --enable-shared --with-pic \
 		--enable-python \
 		--disable-matlab --disable-superlu \
-		--with-mumps="-lsmumps_seq -ldmumps_seq -lcmumps_seq -lzmumps_seq -lpord_seq" \
 		CFLAGS="$(CFLAGS)" \
 		CXXFLAGS="$(CXXFLAGS)" \
 		CPPFLAGS="$(CPPFLAGS)" \
@@ -43,6 +42,14 @@ else
 	configure_flags += --enable-muparser 
 endif
 
+disable_mumps_archs = s390x
+ifneq (,$(filter $(DEB_HOST_ARCH), $(disable_mumps_archs)))
+	configure_flags += --disable-mumps
+else
+	configure_flags += --enable-mumps --with-mumps="-lsmumps_seq -ldmumps_seq -lcmumps_seq -lzmumps_seq -lpord_seq"  
+endif
+
+
 
 
 # shared library versions, option 1

-- 
Packaging for getfem++