[SCM] FreeFem++ packaging branch, experimental, updated. debian/3.20-1-13-gbd0dac0
Christophe Trophime
christrophime at googlemail.com
Mon Feb 11 12:32:22 UTC 2013
The following commit has been merged in the experimental branch:
commit cfcb5f5fb326496ddefa1b532ea8f447459df8a7
Author: Christophe Trophime <christrophime at googlemail.com>
Date: Mon Feb 11 13:29:08 2013 +0100
update patches
diff --git a/debian/patches/configure.patch b/debian/patches/configure.patch
index 96fb832..8e60b71 100644
--- a/debian/patches/configure.patch
+++ b/debian/patches/configure.patch
@@ -1,7 +1,7 @@
Index: freefem++-3.20/configure.ac
===================================================================
--- freefem++-3.20.orig/configure.ac 2012-10-18 13:07:39.000000000 +0200
-+++ freefem++-3.20/configure.ac 2013-01-20 19:06:33.072259323 +0100
++++ freefem++-3.20/configure.ac 2013-02-08 10:47:34.000000000 +0100
@@ -41,6 +41,7 @@
]) dnl
m4_define([AC_FF_WHERELIB],
@@ -27,11 +27,10 @@ Index: freefem++-3.20/configure.ac
fi
])dnl end m4_define AC_FF_WHERELIB
-@@ -2076,8 +2080,16 @@
+@@ -2076,29 +2080,42 @@
test -n "$ff_mkl_scalapack" && ff_scalapack="$ff_mkl_scalapack"
test -n "$ff_mkl_root" && ff_winc="$ff_mkl_root/include/mkl_blas.h"
--
+# For ipot
+AC_CHECK_HEADERS(cstddef,
+ [AC_DEFINE(HAVE_CSTDDEF, 1, cstddef exists)],
@@ -39,34 +38,58 @@ Index: freefem++-3.20/configure.ac
+AC_CHECK_HEADERS(stddef.h,
+ [AC_DEFINE(HAVE_STDDEF_H, 1, stddef.h exists)],
+ [])
-+
+
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]],
-@@ -2088,17 +2100,21 @@
- [[Superlu4],[-lsuperlu4],[superlu4/slu_ddefs.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]],
++ [[mumps_seq],[-ldmumps_seq -lzmumps_seq -lmumps_common_seq -lpord_seq],[/usr/include/dmumps_c.h],[]],
++ [[mumps],[-ldmumps -lzmumps -lmumps_common -lpord],[/usr/include/dmumps_c.h],[]],
++ [[mumps_ptscotch],[-lpord_ptscotch -lmumps_common_ptscotch -ldmumps_ptscotch -lzmumps_ptscotch -lpord_ptscotch],[/usr/include/dmumps_c.h]],
++ [[mumps_scotch],[-lpord_scotch -lmumps_common_scotch -ldmumps_scotch -lzmumps_scotch -lpord_scotch],[/usr/include/dmumps_c.h]],
+ [[hypre],[-lHYPRE]],
+ [[fftw3],[-lfftw3],[/usr/include/fftw3.h],[]],
+- [[superlu_dist],[-lsuperlu-dist],[superlu-dist/superlu_defs.h],[]],
+- [[superlu],[-lsuperlu],[superlu/slu_ddefs.h],[]],
+- [[Superlu4],[-lsuperlu4],[superlu4/slu_ddefs.h],[]],
++ [[superlu_dist],[-lsuperlu-dist],[/usr/include/superlu-dist/superlu_defs.h],[]],
++ [[superlu],[-lsuperlu],[/usr/include/superlu/slu_ddefs.h],[]],
++ [[Superlu4],[-lsuperlu4],[/usr/include/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],[]],
++ [[scotch],[-lscotch -lscotcherr],[/usr/include/scotch/scotch.h],[]],
[[ptscotch],[-lptscotch -lptscotcherr],[]],
- [[metis],[-lscotch -lmetis],[metis/metis.h],[]],
- [[metis],[-lscotch -lmetis],[metis.h],[]],
+- [[metis],[-lscotch -lmetis],[metis/metis.h],[]],
+- [[metis],[-lscotch -lmetis],[metis.h],[]],
++ [[metis],[-lscotch -lmetis],[/usr/include/metis/metis.h],[]],
[[parmetis],[-lptscotch -lparmetis],[],[]],
- [[freeyams],[-lfreeyams],[freeyamslib.h],[]],
+- [[freeyams],[-lfreeyams],[freeyamslib.h],[]],
- [[mmg3d],[-lmmg3d],[libmmg3d.h],[]],
-+ [[mmg3d],[-lmmg3dlib4.0],[libmmg3d.h],[]],
++ [[freeyams],[-lfreeyams],[/usr/include/freeyamslib.h],[]],
++ [[mmg3d_v4],[-lmmg3dlib4.0],[/usr/include/libmmg3d.h],[]],
[[mshmet],[-lmshmet],[],[]],
- [[gsl],[-lgsl -lgslcblas -lm],[gsl/gsl_sf.h],[]],
+- [[gsl],[-lgsl -lgslcblas -lm],[gsl/gsl_sf.h],[]],
- [[parms],[-lparms -litsol -llapack -lblas -lm],[],[]],
-+ [[parms],[-lparms2 -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],[]],
+- [[tetgen],[-ltet],[tetgen.h],[]],
++ [[gsl],[-lgsl -lgslcblas -lm],[/usr/include/gsl/gsl_sf.h],[]],
++ [[parms],[-lparms2 -litsol -llapack -lblas -lm -lmpi_f77],[/usr/include/libparms2/psparslib.h],[]],
++ [[double_pastix],[-lpastix -lgfortran -lm -lrt -L/usr/lib -lscotch -lscotcherrexit -lpthread],[],[]],
++ [[complex_pastix],[-lpastix -lgfortran -lm -lrt -L/usr/lib -lscotch -lscotcherrexit -lpthread],[],[]],
++ [[tetgen],[-ltet],[/usr/include/tetgen.h],[]],
++ [[hips],[-lhips],[/usr/include/hips/hips.h],[]],
++ [[nlopt],[-lnlopt],[/usr/include/nlopt.h],[]],
++ [[Ipopt],[-lipopt -ldmumps -lblas -lm -ldl],[/usr/include/coin/IpIpoptApplication.hpp],[]],
++ [[gmm],[-lm],[/usr/include/gmm/gmm.h],[]],
]
)
+@@ -2197,3 +2214,8 @@
+ AC_MSG_NOTICE([ *********************************************** ])
+ fi
+
++AC_MSG_NOTICE([Compilation options: ])
++AC_MSG_NOTICE([CPPFLAGS=$CPPFLAGS])
++AC_MSG_NOTICE([CFLAGS=$CFLAGS])
++AC_MSG_NOTICE([CXXFLAGS=$CXXFLAGS])
++AC_MSG_NOTICE([LDFLAGS=$LDFLAGS])
diff --git a/debian/patches/examples++-load-Makefile.patch b/debian/patches/examples++-load-Makefile.patch
index 6aeec1a..7ecf687 100644
--- a/debian/patches/examples++-load-Makefile.patch
+++ b/debian/patches/examples++-load-Makefile.patch
@@ -1,25 +1,16 @@
Fix locating of file freefem++.pref
---- a/examples++-load/Makefile.am
-+++ b/examples++-load/Makefile.am
-@@ -157,8 +157,7 @@
- $(INSTALL_DATA) clapack.h ppmimg.h bmo.hpp msh3.hpp pcm.hpp include/* $(DESTDIR)$(ff_prefix_dir)/include
- $(INSTALL) -m 555 $(LIST_COMPILE) $(DESTDIR)$(ff_prefix_dir)/lib
- echo loadpath += \"./\" >$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref
-- echo loadpath += \"$(ff_prefix_dir)/lib\" >>$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref
-- echo includepath += \"$(ff_prefix_dir)/idp\" >>$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref
-+ echo loadpath += \"$(prefix)/lib/freefem++\" >>$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref
- $(INSTALL_SCRIPT) ff-c++ $(DESTDIR)${bindir}
- $(INSTALL_SCRIPT) ff-pkg-download $(DESTDIR)${bindir}
- $(INSTALL_SCRIPT) ff-get-dep $(DESTDIR)${bindir}
---- a/examples++-load/Makefile.in
-+++ b/examples++-load/Makefile.in
-@@ -778,8 +778,7 @@
+Index: freefem++-3.20/examples++-load/Makefile.am
+===================================================================
+--- freefem++-3.20.orig/examples++-load/Makefile.am 2013-02-08 16:41:05.000000000 +0100
++++ freefem++-3.20/examples++-load/Makefile.am 2013-02-08 16:54:31.000000000 +0100
+@@ -157,8 +157,8 @@
$(INSTALL_DATA) clapack.h ppmimg.h bmo.hpp msh3.hpp pcm.hpp include/* $(DESTDIR)$(ff_prefix_dir)/include
$(INSTALL) -m 555 $(LIST_COMPILE) $(DESTDIR)$(ff_prefix_dir)/lib
echo loadpath += \"./\" >$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref
- echo loadpath += \"$(ff_prefix_dir)/lib\" >>$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref
- echo includepath += \"$(ff_prefix_dir)/idp\" >>$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref
+ echo loadpath += \"$(prefix)/lib/freefem++\" >>$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref
++ echo includepath += \"$(prefix)/share/freefem++/idp\" >>$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref
$(INSTALL_SCRIPT) ff-c++ $(DESTDIR)${bindir}
$(INSTALL_SCRIPT) ff-pkg-download $(DESTDIR)${bindir}
$(INSTALL_SCRIPT) ff-get-dep $(DESTDIR)${bindir}
diff --git a/debian/patches/examples++-mpi.patch b/debian/patches/examples++-mpi.patch
index d17db7e..d50813a 100644
--- a/debian/patches/examples++-mpi.patch
+++ b/debian/patches/examples++-mpi.patch
@@ -1,7 +1,7 @@
Index: freefem++-3.20/examples++-mpi/hips_FreeFem.cpp
===================================================================
---- freefem++-3.20.orig/examples++-mpi/hips_FreeFem.cpp 2013-01-10 09:31:07.000000000 +0100
-+++ freefem++-3.20/examples++-mpi/hips_FreeFem.cpp 2013-01-10 17:17:03.000000000 +0100
+--- freefem++-3.20.orig/examples++-mpi/hips_FreeFem.cpp 2013-02-08 15:07:48.000000000 +0100
++++ freefem++-3.20/examples++-mpi/hips_FreeFem.cpp 2013-02-08 15:20:39.000000000 +0100
@@ -45,8 +45,8 @@
#endif
@@ -13,3 +13,29 @@ Index: freefem++-3.20/examples++-mpi/hips_FreeFem.cpp
}
#include <stdio.h>
#include <stdlib.h>
+Index: freefem++-3.20/examples++-mpi/complex_pastix_FreeFem.cpp
+===================================================================
+--- freefem++-3.20.orig/examples++-mpi/complex_pastix_FreeFem.cpp 2012-10-18 13:07:39.000000000 +0200
++++ freefem++-3.20/examples++-mpi/complex_pastix_FreeFem.cpp 2013-02-08 15:23:31.000000000 +0100
+@@ -55,7 +55,7 @@
+ #include <sys/time.h>
+
+
+-#include "pastix_long_complex.h"
++#include "pastix/pastix_long_complex.h"
+
+ #undef memFree_null
+ #define memFree_null(x) {if (x ==NULL) {fprintf(stdout,"%s:%d freeing NULL\n",__FILE__,__LINE__);} free(x); x=NULL;}
+Index: freefem++-3.20/examples++-mpi/real_pastix_FreeFem.cpp
+===================================================================
+--- freefem++-3.20.orig/examples++-mpi/real_pastix_FreeFem.cpp 2012-10-18 13:07:39.000000000 +0200
++++ freefem++-3.20/examples++-mpi/real_pastix_FreeFem.cpp 2013-02-08 15:22:53.000000000 +0100
+@@ -76,7 +76,7 @@
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+-#include "pastix.h"
++#include "pastix/pastix.h"
+ //#include "cscd_utils.h"
+ #ifdef __cplusplus
+ }
diff --git a/debian/patches/series b/debian/patches/series
index c3e670a..0bbbc7c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ examples++-load-Makefile.patch
examples++-load-load-link-in.patch
examples-bamg-test-dotest-pl.patch
examples++-mpi.patch
+examples++-load.patch
--
FreeFem++ packaging
More information about the debian-science-commits
mailing list