r46819 - in /packages/ffcs/trunk/debian: control patches/ff-configure.patch patches/ff-examples++-mpi.patch patches/ff-remove_examples.patch patches/series
trophime-guest at users.alioth.debian.org
trophime-guest at users.alioth.debian.org
Tue Jul 15 16:25:34 UTC 2014
Author: trophime-guest
Date: Tue Jul 15 16:25:34 2014
New Revision: 46819
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46819
Log:
update patches - remove examples with complex
Added:
packages/ffcs/trunk/debian/patches/ff-remove_examples.patch
Modified:
packages/ffcs/trunk/debian/control
packages/ffcs/trunk/debian/patches/ff-configure.patch
packages/ffcs/trunk/debian/patches/ff-examples++-mpi.patch
packages/ffcs/trunk/debian/patches/series
Modified: packages/ffcs/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/control?rev=46819&op=diff
==============================================================================
--- packages/ffcs/trunk/debian/control (original)
+++ packages/ffcs/trunk/debian/control Tue Jul 15 16:25:34 2014
@@ -12,6 +12,7 @@
gfortran,
mpi-default-dev,
cdbs,
+ quilt,
flex,
bison,
libhypre-dev,
@@ -25,7 +26,7 @@
libfltk1.3-dev | libfltk-dev,
freeglut3-dev,
texlive, texlive-extra-utils, texlive-latex-extra, texlive-font-utils, ghostscript,
- libmumps-dev, libmumps-scotch-dev, libmumps-ptscotch-dev,
+ libmumps-seq-dev, libmumps-dev, libmumps-scotch-dev, libmumps-ptscotch-dev,
libgmm++-dev,
libblacs-mpi-dev, libscalapack-mpi-dev,
libscotch-dev, libptscotch-dev,
Modified: 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=46819&op=diff
==============================================================================
--- packages/ffcs/trunk/debian/patches/ff-configure.patch (original)
+++ packages/ffcs/trunk/debian/patches/ff-configure.patch Tue Jul 15 16:25:34 2014
@@ -30,20 +30,18 @@
+AC_SUBST(CXXFLAGS, "$CXXFLAGS -DHAVE_CSTDDEF")
+
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]],
- [[hypre],[-lHYPRE]],
- [[fftw3],[-lfftw3],[/usr/include/fftw3.h],[]],
-- [[superlu_dist],[-lsuperlu-dist],[/usr/include/superlu-dist/superlu_defs.h],[]],
-- [[superlu],[-lsuperlu],[/usr/include/superlu/superlu_enum_consts.h],[]],
++ [[mumps_seq],[-ldmumps_seq -lzmumps_seq -lmumps_common_seq -lpord_seq],[dmumps_c.h],[]],
++ [[hypre],[-lHYPRE_utilities -lHYPRE_multivector -lHYPRE_krylov -lHYPRE_struct_mv -lHYPRE_struct_ls -lHYPRE_sstruct_mv -lHYPRE_sstruct_ls -lHYPRE_seq_mv -lHYPRE_parcsr_mv -lHYPRE_parcsr_ls -lHYPRE_parcsr_block_mv -lHYPRE_DistributedMatrix -lHYPRE_MatrixMatrix -lHYPRE_IJ_mv -lHYPRE_Euclid -lHYPRE_ParaSails -lHYPRE_DistributedMatrixPilutSolver -lHYPRE],[],[]],
++ [[fftw3],[-lfftw3],[fftw3.h],[]],
+ [[superlu_dist],[-lsuperlu-dist],[/usr/include/superlu-dist/superlu_defs.h],[]],
+ [[superlu],[-lsuperlu],[/usr/include/superlu/superlu_enum_consts.h],[]],
- [[Superlu4],[-lsuperlu4],[/usr/include/superlu4/superlu_enum_consts.h],[]],
- [[blacs],[ -lblacsCinit$ff_with_mpi -lblacsF77init$ff_with_mpi -lblacs$ff_with_mpi],[]],
-+ [[hypre],[-lHYPRE_utilities -lHYPRE_multivector -lHYPRE_krylov -lHYPRE_struct_mv -lHYPRE_struct_ls -lHYPRE_sstruct_mv -lHYPRE_sstruct_ls -lHYPRE_seq_mv -lHYPRE_parcsr_mv -lHYPRE_parcsr_ls -lHYPRE_parcsr_block_mv -lHYPRE_DistributedMatrix -lHYPRE_MatrixMatrix -lHYPRE_IJ_mv -lHYPRE_Euclid -lHYPRE_ParaSails -lHYPRE_DistributedMatrixPilutSolver -lHYPRE]],
-+ [[fftw3],[-lfftw3],[fftw3.h],[]],
-+ [[superlu_dist],[-lsuperlu-dist],[superlu-dist/superlu_defs.h],[]],
-+ [[superlu],[-lsuperlu],[superlu/superlu_enum_consts.h],[]],
+ [[blacs],[ -lblacsCinit$ff_with_mpi -lblacsF77init$ff_with_mpi -lblacs$ff_with_mpi],[]],
[[scalapack],[-lscalapack$ff_with_mpi],[]],
- [[scotch],[-lscotch -lscotcherr],[scotch.h]],
@@ -51,8 +49,8 @@
- [[metis],[-lscotch -lmetis],[/usr/include/metis/metis.h],[]],
- [[metis],[-lscotch -lmetis],[metis.h],[]],
- [[parmetis],[-lptscotch -lparmetis],[],[]],
-+ [[scotch],[-lscotch -lscotcherr],[scotch/scotch.h]],
-+ [[ptscotch],[-lptscotch -lptscotcherr],[scotch/ptscotch.h]],
++ [[scotch],[-lscotch -lscotcherr],[/usr/include/scotch/scotch.h]],
++ [[ptscotch],[-lptscotch -lptscotcherr],[/usr/include/scotch/ptscotch.h]],
+ [[metis],[-lmetis],[metis.h],[]],
+ [[parmetis],[-lptscotch -lparmetis],[parmetis.h],[]],
[[freeyams],[-lfreeyams],[freeyamslib.h],[]],
@@ -62,16 +60,25 @@
[[mshmet],[-lmshmet],[],[]],
[[gsl],[-lgsl -lgslcblas -lm],[gsl/gsl_sf.h],[]],
- [[parms],[-lparms -litsol -llapack -lblas -lm],[],[]],
-+ [[parms],[-lmpif77 -lparms2 -litsol -llapack -lblas -lm],[],[]],
-+ [[double_pastix],[-lpastix],[pastix/pastix.h],[]],
++ [[parms],[-lmpif77 -lparms2 -litsol -llapack -lblas -lm],[/usr/include/libparms2/psparslib.h],[]],
++ [[double_pastix],[-lpastix],[/usr/include/pastix/pastix.h],[]],
[[tetgen],[-ltet],[tetgen.h],[]],
-+ [[hips],[-lhips],[hips/hips.h],[]],
++ [[hips],[-lhips],[/usr/include/hips/hips.h],[]],
+ [[nlopt],[-lnlopt],[nlopt.h],[]],
-+ [[Ipopt],[-lipopt -ldmumps -lblas -lm -ldl],[coin/IpIpoptApplication.hpp],[]],
-+ [[gmm],[],[gmm/gmm.h],[]],
++ [[Ipopt],[-lipopt -ldmumps -lblas -lm -ldl],[/usr/include/coin/IpIpoptApplication.hpp],[]],
++ [[gmm],[],[/usr/include/gmm/gmm.h],[]],
]
)
## before try
+@@ -1687,7 +1697,7 @@ TOOL_DISABLE(metis,metis.$DYLIB_SUFFIX)
+ TOOL_DISABLE(mmg3d,mmg3d-v4.0.$DYLIB_SUFFIX)
+ TOOL_DISABLE(mshmet,mshmet.$DYLIB_SUFFIX)
+ TOOL_DISABLE(mumps,"MUMPS_FreeFem.$DYLIB_SUFFIX MUMPS.$DYLIB_SUFFIX")
+-TOOL_DISABLE(mumps_seq,MUMPS_seq.$DYLIB_SUFFIX,mumps-seq)
++TOOL_DISABLE(mumps_seq,MUMPS_seq.$DYLIB_SUFFIX)
+ TOOL_DISABLE(nlopt,ff-NLopt.$DYLIB_SUFFIX)
+ TOOL_DISABLE(parmetis)
+ TOOL_DISABLE(parms,parms_FreeFem.$DYLIB_SUFFIX)
@@ -1767,7 +1777,6 @@ ff_progs="FreeFem++-nw $ff_bamgprog $ff
AC_SUBST(TEST_FFPP,"../src/nw/FreeFem++")
AC_SUBST(TEST_FFPPMPI,"../src/mpi/ff-mpirun")
@@ -80,18 +87,3 @@
ff_blacs="-lblacsCinit$ff_with_mpi -lblacsF77init$ff_with_mpi -lblacs$ff_with_mpi"
ff_scalapack=-lscalapack
-Index: ffcs-14.5/ff/upstream/examples++-mpi/hips_FreeFem.cpp
-===================================================================
---- ffcs-14.5.orig/ff/upstream/examples++-mpi/hips_FreeFem.cpp
-+++ ffcs-14.5/ff/upstream/examples++-mpi/hips_FreeFem.cpp
-@@ -45,8 +45,8 @@ using namespace std;
- #endif
-
- extern "C" {
--#include "hips.h"
--#include "metis.h"
-+#include "hips/hips.h"
-+#include "metis/metis.h"
- }
- #include <stdio.h>
- #include <stdlib.h>
Modified: packages/ffcs/trunk/debian/patches/ff-examples++-mpi.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/patches/ff-examples%2B%2B-mpi.patch?rev=46819&op=diff
==============================================================================
--- packages/ffcs/trunk/debian/patches/ff-examples++-mpi.patch (original)
+++ packages/ffcs/trunk/debian/patches/ff-examples++-mpi.patch Tue Jul 15 16:25:34 2014
@@ -2,7 +2,7 @@
===================================================================
--- ffcs-14.5.orig/ff/upstream/examples++-mpi/Makefile.am
+++ ffcs-14.5/ff/upstream/examples++-mpi/Makefile.am
-@@ -39,8 +39,6 @@ AddLayer3d.idp DDM-funcs-v2.idp MPIplot
+@@ -39,13 +39,10 @@ AddLayer3d.idp DDM-funcs-v2.idp MPIplot
EXTRA_DIST=*.edp *.idp regtests.sh \
MPICG.cpp \
MUMPS_FreeFem.cpp \
@@ -11,3 +11,32 @@
dSuperLU_DIST.cpp \
ffsuperludistoption-1.hpp \
ffsuperludistoption.hpp \
+ generaldefs.h \
+-hips_FreeFem.cpp \
+ hypre_FreeFem.cpp \
+ interfacepastix.cpp \
+ parms_FreeFem.cpp \
+@@ -59,7 +56,7 @@ MUMPS.edp dmatrix.hpp
+ # [[file:../../../configure.ac::tools_problems_all_platforms]] for reasons why some tools may be
+ # deactivated).
+
+-LIST_COMPILE=@TOOL_DYLIB_mumps@ @TOOL_DYLIB_hips@ @TOOL_DYLIB_superludist@ @TOOL_DYLIB_pastix@ MPICG.$(DYLIB_SUFFIX) \
++LIST_COMPILE=@TOOL_DYLIB_mumps@ @TOOL_DYLIB_superludist@ MPICG.$(DYLIB_SUFFIX) \
+ @TOOL_DYLIB_parms@ mpi-cmaes.$(DYLIB_SUFFIX)
+
+ if FFCS_MPIOK
+@@ -74,13 +71,13 @@ else
+ all-local:
+ endif
+
+-.cpp.$(DYLIB_SUFFIX): ../examples++-load/ff-c++ ../examples++-load/WHERE_LIBRARY-download
+ # FFCS needs an error exit code to make sure that all libraries are correctly compiled
+ #
+ # FFCS on Windows inserts all MPI options (include, lib, ...) in the $MPICXX compiler script, instead of "$CXX $MPI_xxx",
+ # but it needs '-mpi' to do that
+ #
+ ### -../examples++-load/ff-c++ -auto $<
++.cpp.$(DYLIB_SUFFIX): ../examples++-load/ff-c++ ../examples++-load/WHERE_LIBRARY-download
+ ../examples++-load/ff-c++ -auto -mpi $<
+
+ install-exec-local::
Added: packages/ffcs/trunk/debian/patches/ff-remove_examples.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/patches/ff-remove_examples.patch?rev=46819&op=file
==============================================================================
--- packages/ffcs/trunk/debian/patches/ff-remove_examples.patch (added)
+++ packages/ffcs/trunk/debian/patches/ff-remove_examples.patch Tue Jul 15 16:25:34 2014
@@ -0,0 +1,60 @@
+Index: ffcs-14.5/ff/upstream/examples++-mpi/Makefile.am
+===================================================================
+--- ffcs-14.5.orig/ff/upstream/examples++-mpi/Makefile.am
++++ ffcs-14.5/ff/upstream/examples++-mpi/Makefile.am
+@@ -39,13 +39,10 @@ AddLayer3d.idp DDM-funcs-v2.idp MPIplot
+ EXTRA_DIST=*.edp *.idp regtests.sh \
+ MPICG.cpp \
+ MUMPS_FreeFem.cpp \
+-complex_SuperLU_DIST_FreeFem.cpp \
+-complex_pastix_FreeFem.cpp \
+ dSuperLU_DIST.cpp \
+ ffsuperludistoption-1.hpp \
+ ffsuperludistoption.hpp \
+ generaldefs.h \
+-hips_FreeFem.cpp \
+ hypre_FreeFem.cpp \
+ interfacepastix.cpp \
+ parms_FreeFem.cpp \
+@@ -59,7 +56,7 @@ MUMPS.edp dmatrix.hpp
+ # [[file:../../../configure.ac::tools_problems_all_platforms]] for reasons why some tools may be
+ # deactivated).
+
+-LIST_COMPILE=@TOOL_DYLIB_mumps@ @TOOL_DYLIB_hips@ @TOOL_DYLIB_superludist@ @TOOL_DYLIB_pastix@ MPICG.$(DYLIB_SUFFIX) \
++LIST_COMPILE=@TOOL_DYLIB_mumps@ @TOOL_DYLIB_superludist@ MPICG.$(DYLIB_SUFFIX) \
+ @TOOL_DYLIB_parms@ mpi-cmaes.$(DYLIB_SUFFIX)
+
+ if FFCS_MPIOK
+@@ -74,13 +71,13 @@ else
+ all-local:
+ endif
+
+-.cpp.$(DYLIB_SUFFIX): ../examples++-load/ff-c++ ../examples++-load/WHERE_LIBRARY-download
+ # FFCS needs an error exit code to make sure that all libraries are correctly compiled
+ #
+ # FFCS on Windows inserts all MPI options (include, lib, ...) in the $MPICXX compiler script, instead of "$CXX $MPI_xxx",
+ # but it needs '-mpi' to do that
+ #
+ ### -../examples++-load/ff-c++ -auto $<
++.cpp.$(DYLIB_SUFFIX): ../examples++-load/ff-c++ ../examples++-load/WHERE_LIBRARY-download
+ ../examples++-load/ff-c++ -auto -mpi $<
+
+ install-exec-local::
+Index: ffcs-14.5/ff/upstream/configure.ac
+===================================================================
+--- ffcs-14.5.orig/ff/upstream/configure.ac
++++ ffcs-14.5/ff/upstream/configure.ac
+@@ -1701,11 +1701,11 @@ TOOL_DISABLE(mumps_seq,MUMPS_seq.$DYLIB_
+ TOOL_DISABLE(nlopt,ff-NLopt.$DYLIB_SUFFIX)
+ TOOL_DISABLE(parmetis)
+ TOOL_DISABLE(parms,parms_FreeFem.$DYLIB_SUFFIX)
+-TOOL_DISABLE(pastix,"interfacepastix.$DYLIB_SUFFIX complex_pastix_FreeFem.$DYLIB_SUFFIX real_pastix_FreeFem.$DYLIB_SUFFIX")
++TOOL_DISABLE(pastix,"interfacepastix.$DYLIB_SUFFIX real_pastix_FreeFem.$DYLIB_SUFFIX")
+ TOOL_DISABLE(pipe,pipe.$DYLIB_SUFFIX)
+ TOOL_DISABLE(scotch,scotch.$DYLIB_SUFFIX)
+ TOOL_DISABLE(superlu,SuperLu.$DYLIB_SUFFIX)
+-TOOL_DISABLE(superludist,"complex_SuperLU_DIST_FreeFem.$DYLIB_SUFFIX real_SuperLU_DIST_FreeFem.$DYLIB_SUFFIX dSuperLU_DIST.$DYLIB_SUFFIX")
++TOOL_DISABLE(superludist,"real_SuperLU_DIST_FreeFem.$DYLIB_SUFFIX dSuperLU_DIST.$DYLIB_SUFFIX")
+ TOOL_DISABLE(umfpack,UMFPACK64.$DYLIB_SUFFIX)
+ TOOL_DISABLE(yams,freeyams.$DYLIB_SUFFIX)
+ TOOL_DISABLE(pipe,pipe.$DYLIB_SUFFIX)
Modified: packages/ffcs/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/ffcs/trunk/debian/patches/series?rev=46819&op=diff
==============================================================================
--- packages/ffcs/trunk/debian/patches/series (original)
+++ packages/ffcs/trunk/debian/patches/series Tue Jul 15 16:25:34 2014
@@ -13,4 +13,4 @@
# more freefem++ patches
#
ff-examples++-load.patch
-ff-examples++-mpi.patch
+ff-remove_examples.patch
More information about the debian-science-commits
mailing list