r45470 - /packages/ffcs/trunk/debian/patches/ff-configure.patch

[trophime-guest at users.alioth.debian.org]

Author: trophime-guest
Date: Fri Dec 14 15:21:53 2012
New Revision: 45470

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45470
Log:
add missing patch

Added:
    packages/ffcs/trunk/debian/patches/ff-configure.patch

Added: packages/ffcs/trunk/debian/patches/ff-configure.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/patches/ff-configure.patch?rev=45470&op=file
==============================================================================
--- packages/ffcs/trunk/debian/patches/ff-configure.patch (added)
+++ packages/ffcs/trunk/debian/patches/ff-configure.patch Fri Dec 14 15:21:53 2012
@@ -1,0 +1,51 @@
+Index: ffcs-12.17/ff/upstream/configure.ac
+===================================================================
+--- ffcs-12.17.orig/ff/upstream/configure.ac	2012-12-14 15:02:32.000000000 +0100
++++ ffcs-12.17/ff/upstream/configure.ac	2012-12-14 15:59:14.000000000 +0100
+@@ -1901,6 +1901,7 @@
+ 
+ 
+ m4_map([AC_FF_WHERELIB],[ 
++	[[mumps-seq],[-ldmumps_seq -lzmumps_seq  -lmumps_common_seq  -lpord_seq],[dmumps_c.h],[]],
+ 	[[mumps],[-ldmumps -lzmumps  -lmumps_common  -lpord],[dmumps_c.h],[]],
+ 	[[mumps_ptscotch],[-lpord_ptscotch -lmumps_common_ptscotch -ldmumps_ptscotch -lzmumps_ptscotch -lpord_ptscotch],[dmumps_c.h]],
+ 	[[mumps_scotch],[-lpord_scotch -lmumps_common_scotch -ldmumps_scotch -lzmumps_scotch -lpord_scotch],[dmumps_c.h]],
+@@ -1911,17 +1912,21 @@
+ 	[[Superlu4],[-lsuperlu4],[superlu4/slu_ddefs.h],[]],
+         [[blacs],[ -lblacsCinit$ff_with_mpi	-lblacsF77init$ff_with_mpi	-lblacs$ff_with_mpi],[]],
+         [[scalapack],[-lscalapack$ff_with_mpi],[]],
+-        [[scotch],[-lscotch -lscotcherr],[]],
++        [[scotch],[-lscotch -lscotcherr],[scotch/scotch.h]],
+         [[ptscotch],[-lptscotch -lptscotcherr],[]],
+ 	[[metis],[-lscotch -lmetis],[metis/metis.h],[]],
+ 	[[metis],[-lscotch -lmetis],[metis.h],[]],
+ 	[[parmetis],[-lptscotch -lparmetis],[],[]],
+ 	[[freeyams],[-lfreeyams],[freeyamslib.h],[]],
+-	[[mmg3d],[-lmmg3d],[libmmg3d.h],[]],
++	[[mmg3d-v4],[-lmmg3dlib4.0],[libmmg3d.h],[]],
+ 	[[mshmet],[-lmshmet],[],[]],
+ 	[[gsl],[-lgsl -lgslcblas -lm],[gsl/gsl_sf.h],[]],
+ 	[[parms],[-lparms -litsol -llapack -lblas -lm],[],[]],
+ 	[[tetgen],[-ltet],[tetgen.h],[]],
++	[[hips],[-lhips],[hips/hips.h],[]],
++	[[nlopt],[-lnlopt],[nlopt.h],
++	[[Ipopt],[-lipopt -ldmumps -lblas -lm -ldl],[coin/IpIpoptApplication.hpp],[]],
++	[[gmm]],[],[gmm/gmm.h,[]],
+     ]
+     )
+ 
+Index: ffcs-12.17/ff/upstream/examples++-mpi/hips_FreeFem.cpp
+===================================================================
+--- ffcs-12.17.orig/ff/upstream/examples++-mpi/hips_FreeFem.cpp	2012-12-14 15:02:32.000000000 +0100
++++ ffcs-12.17/ff/upstream/examples++-mpi/hips_FreeFem.cpp	2012-12-14 15:02:37.000000000 +0100
+@@ -45,8 +45,8 @@
+ #endif
+ 
+ extern "C" {
+-#include "hips.h"  
+-#include "metis.h"
++#include "hips/hips.h"  
++#include "metis/metis.h"
+ }
+ #include <stdio.h>
+ #include <stdlib.h>