[freefempp] 04/09: Remove all patches
Dimitrios Eftaxiopoulos
eftaxiop-guest at alioth.debian.org
Fri Sep 6 22:13:42 UTC 2013
This is an automated email from the git hooks/post-receive script.
eftaxiop-guest pushed a commit to branch eftaxiop
in repository freefempp.
commit 04e5fc4bcae958f2ecd134f843d462002e3a5293
Author: Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>
Date: Fri Sep 6 18:08:20 2013 +0300
Remove all patches
---
debian/patches/configure.patch | 94 ---------------------
debian/patches/examples++-load-Makefile-am.patch | 22 -----
debian/patches/examples++-load-load-link-in.patch | 12 ---
debian/patches/examples++-load.patch | 72 ----------------
debian/patches/examples++-mpi.patch | 36 --------
debian/patches/examples-bamg-test-dotest-pl.patch | 9 --
debian/patches/series | 6 --
7 files changed, 251 deletions(-)
diff --git a/debian/patches/configure.patch b/debian/patches/configure.patch
deleted file mode 100644
index c38678b..0000000
--- a/debian/patches/configure.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-Fix compilation issues related to libraries and flags
---- a/configure.ac
-+++ b/configure.ac
-@@ -41,6 +41,7 @@
- ]) dnl
- m4_define([AC_FF_WHERELIB],
- [ if test -z "$ff_where_lib_conf_$1" ; then
-+ dnl AC_MSG_NOTICE([AC_FF_WHERELIB check $1 $2 $3 $4])
- AC_MSG_CHECKING(check $1)
- ff_save_libs=$LIBS
- LIBS="$LIBS $2 $4"
-@@ -49,6 +50,7 @@
- echo "$1 LD $2" >>$ff_where_lib_conf
- ff_WHERE_INC=`AS_DIRNAME(["$3"])`
- if test -n "$ff_WHERE_INC" -a "$ff_WHERE_INC" != '.' ; then
-+ dnl AC_MSG_NOTICE([AC_FF_WHERELIB $1 INCLUDE -I$ff_WHERE_INC])
- echo "$1 INCLUDE -I$ff_WHERE_INC" >>$ff_where_lib_conf
- fi
- fi
-@@ -56,6 +58,8 @@
-
- ff_where_lib_conf_$1=1
- LIBS=$ff_save_libs
-+ dnl else
-+ dnl AC_MSG_NOTICE([AC_FF_WHERELIB nocheck $1 $2 $3 $4])
- fi
- ])dnl end m4_define AC_FF_WHERELIB
-
-@@ -1977,29 +1981,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)],
-+ [])
-+AC_CHECK_HEADERS(stddef.h,
-+ [AC_DEFINE(HAVE_STDDEF_H, 1, stddef.h exists)],
-+ [])
-
- m4_map([AC_FF_WHERELIB],[
-- [[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],[/usr/include/scotch/scotch.h],[]],
- [[ptscotch],[-lptscotch -lptscotcherr],[]],
-- [[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],[]],
-- [[mmg3d],[-lmmg3d],[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],[]],
-- [[parms],[-lparms -litsol -llapack -lblas -lm],[],[]],
-- [[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],[]],
- ]
- )
-
-@@ -2093,3 +2110,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-am.patch b/debian/patches/examples++-load-Makefile-am.patch
deleted file mode 100644
index ffc8d71..0000000
--- a/debian/patches/examples++-load-Makefile-am.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/examples++-load/Makefile.am
-+++ b/examples++-load/Makefile.am
-@@ -1,7 +1,7 @@
- # $Id$
-
- all-local: @LOAD_COMPILE@
--TESTS=APk-AdaptEpsDeltaPk.edp APk-ExplicitPkTest.edp APk-FreeFemQA.edp APk-MetricPk.edp IPOTest.edp IpOptMinSurf.edp IpoptLap.edp IpoptMinSurfVol.edp IpoptVI.edp IpoptVI2.edp LapDG3.edp LapDG4.edp LapLNewSolver.edp LapMUMPS_seq.edp LapNewSolver.edp LapUmfpack64.edp LaplaceP3.edp LaplaceP4.edp LaplaceRT1.edp Leman-mesh.edp MetricKuate.edp NSP2BRP0.edp PARDISO.edp SuperLU.edp VarIneq2.edp bilapMorley.edp bmo.edp buildlayermesh.edp checkglumeshcube.edp cmaes-VarIneq.edp cmaes-oven.edp con [...]
-+TESTS=APk-AdaptEpsDeltaPk.edp APk-ExplicitPkTest.edp APk-FreeFemQA.edp APk-MetricPk.edp IPOTest.edp IpOptMinSurf.edp IpoptLap.edp IpoptMinSurfVol.edp IpoptVI.edp IpoptVI2.edp LapDG3.edp LapDG4.edp LapLNewSolver.edp LapMUMPS_seq.edp LapNewSolver.edp LapUmfpack64.edp LaplaceP3.edp LaplaceP4.edp LaplaceRT1.edp Leman-mesh.edp MetricKuate.edp NSP2BRP0.edp PARDISO.edp SuperLU.edp VarIneq2.edp bilapMorley.edp bmo.edp buildlayermesh.edp checkglumeshcube.edp cmaes-VarIneq.edp cmaes-oven.edp conv [...]
- # all test can fail must but clean ???? FH...
- XFAILS_TESTS=$(TESTS)
-
-@@ -154,8 +154,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)/include/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++-load-load-link-in.patch b/debian/patches/examples++-load-load-link-in.patch
deleted file mode 100644
index 14981e3..0000000
--- a/debian/patches/examples++-load-load-link-in.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Fix identification of GNU/kFreeBSD and GNU/Hurd architectures
---- a/examples++-load/load.link.in
-+++ b/examples++-load/load.link.in
-@@ -197,7 +197,7 @@
- FLAGS=' '
- LIBS="'$b/libff.dll' $LIBS $DLL"
- SUF=dll;;
-- FreeBSD|NetBSD)
-+ FreeBSD|NetBSD|GNU/kFreeBSD|GNU)
- SHARED="-shared"
- FLAGS='-fPIC';;
- # 64 bit Linux needs -fPIC (ALH)
diff --git a/debian/patches/examples++-load.patch b/debian/patches/examples++-load.patch
deleted file mode 100644
index 74a1b53..0000000
--- a/debian/patches/examples++-load.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-Add ability to compile freefem++ with Ipopt, freeyams, mmg3d_v4, mshmet, mumps_seq and superlu4
---- a/examples++-load/ff-Ipopt.cpp
-+++ b/examples++-load/ff-Ipopt.cpp
-@@ -23,7 +23,11 @@
- along with Freefem++; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
--//ff-c++-LIBRARY-dep: Ipopt mumps-seq blas libseq fc
-+//ff-c++-LIBRARY-dep: Ipopt
-+
-+#ifndef HAVE_CSTDDEF
-+#define HAVE_CSTDDEF
-+#endif
-
- using namespace std;
- #include "IpTNLP.hpp"
---- a/examples++-load/MUMPS_seq.cpp
-+++ b/examples++-load/MUMPS_seq.cpp
-@@ -25,7 +25,7 @@
- */
-
- // for automatic compilation with ff-c++
--//ff-c++-LIBRARY-dep: mumps-seq blas libseq fc pthread
-+//ff-c++-LIBRARY-dep: mumps_seq blas fc pthread
- //ff-c++-cpp-dep:
- //
- // F. Hecht december 2011
---- a/examples++-load/mmg3d-v4.0.cpp
-+++ b/examples++-load/mmg3d-v4.0.cpp
-@@ -10,7 +10,7 @@
-
- //
- // for automatic compilation with ff-c++
--//ff-c++-LIBRARY-dep: mmg3d-v4
-+//ff-c++-LIBRARY-dep: mmg3d_v4
- //ff-c++-cpp-dep:
- //
-
---- a/examples++-load/SuperLu.cpp
-+++ b/examples++-load/SuperLu.cpp
-@@ -1,7 +1,7 @@
- // for automatic compilation with ff-c++
--//ff-c++-LIBRARY-dep: superlu blas
-+//ff-c++-LIBRARY-dep: Superlu4 blas
- //ff-c++-cpp-dep:
--// for Super4.0 library
-+// for Super4.0 library
- #include "ff++.hpp"
- /*
- #include <iostream>
---- a/examples++-load/mshmet.cpp
-+++ b/examples++-load/mshmet.cpp
-@@ -8,7 +8,7 @@
- // E-MAIL : jacques.morice at ann.jussieu.fr
- //
- // for automatic compilation with ff-c++
--//ff-c++-LIBRARY-dep: mshmet libMesh
-+//ff-c++-LIBRARY-dep: mshmet
- //ff-c++-cpp-dep:
- //
-
---- a/examples++-load/freeyams.cpp
-+++ b/examples++-load/freeyams.cpp
-@@ -8,7 +8,7 @@
- // E-MAIL : jacques.morice at ann.jussieu.fr
- //
- // for automatic compilation with ff-c++
--//ff-c++-LIBRARY-dep: freeyams libMesh
-+//ff-c++-LIBRARY-dep: freeyams
- //ff-c++-cpp-dep:
- //
-
diff --git a/debian/patches/examples++-mpi.patch b/debian/patches/examples++-mpi.patch
deleted file mode 100644
index 25ec639..0000000
--- a/debian/patches/examples++-mpi.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Correct location of pastix, hips and metis header files
---- a/examples++-mpi/hips_FreeFem.cpp
-+++ b/examples++-mpi/hips_FreeFem.cpp
-@@ -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>
---- a/examples++-mpi/complex_pastix_FreeFem.cpp
-+++ b/examples++-mpi/complex_pastix_FreeFem.cpp
-@@ -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;}
---- a/examples++-mpi/real_pastix_FreeFem.cpp
-+++ b/examples++-mpi/real_pastix_FreeFem.cpp
-@@ -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/examples-bamg-test-dotest-pl.patch b/debian/patches/examples-bamg-test-dotest-pl.patch
deleted file mode 100644
index af60b3c..0000000
--- a/debian/patches/examples-bamg-test-dotest-pl.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-Fix location of perl executable
---- a/examples-bamg/test/dotest.pl
-+++ b/examples-bamg/test/dotest.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- # ----- clean ---
- unlink <*.mesh>;
- unlink <*.am_fmt>;
diff --git a/debian/patches/series b/debian/patches/series
index 55140d6..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +0,0 @@
-configure.patch
-examples++-load.patch
-examples++-load-Makefile-am.patch
-examples++-load-load-link-in.patch
-examples-bamg-test-dotest-pl.patch
-examples++-mpi.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/freefempp.git
More information about the debian-science-commits
mailing list