summaryrefslogtreecommitdiff
path: root/math/petsc/files
diff options
context:
space:
mode:
Diffstat (limited to 'math/petsc/files')
-rw-r--r--math/petsc/files/patch-bmake::common::variables20
-rw-r--r--math/petsc/files/patch-makefile58
-rw-r--r--math/petsc/files/patch-python::PETSc::packages::Spooles.py12
-rw-r--r--math/petsc/files/patch-python::PETSc::packages::X11.py27
-rw-r--r--math/petsc/files/patch-src::mat::impls::rowbs::mpi::mpirowbs.h13
-rw-r--r--math/petsc/files/pkg-message.in5
6 files changed, 135 insertions, 0 deletions
diff --git a/math/petsc/files/patch-bmake::common::variables b/math/petsc/files/patch-bmake::common::variables
new file mode 100644
index 000000000000..ce3c2697254e
--- /dev/null
+++ b/math/petsc/files/patch-bmake::common::variables
@@ -0,0 +1,20 @@
+--- ./bmake/common/variables.orig Sat Oct 2 09:13:28 2004
++++ ./bmake/common/variables Thu Oct 7 22:58:14 2004
+@@ -32,7 +32,7 @@
+ #
+ # The following variables define PETSc compile procedures
+ #
+-PETSC_COMPILE = ${CC} -c ${COPTFLAGS} ${CFLAGS} ${CCPPFLAGS} ${SOURCEC} ${SSOURCE}
++PETSC_COMPILE = ${CC} -c ${COPTFLAGS} ${CFLAGS} ${CCPPFLAGS} ${CPPFLAGS} ${SOURCEC} ${SSOURCE}
+ PETSC_COMPILE_SINGLE = ${CC} -c ${COPTFLAGS} ${CFLAGS} ${CCPPFLAGS}
+ PETSC_COMPILE_LIBTOOL = files="${SOURCEC} ${SSOURCE}"; \
+ for filename in $$files; do \
+@@ -122,7 +122,7 @@
+ ${PETSC_HAVE_PNETCDF} ${PETSC_HAVE_HDF4} ${PETSC_HAVE_ML}\
+ ${PETSC_HAVE_CHACO} ${PETSC_HAVE_JOSTLE} ${PETSC_HAVE_PARTY} ${PETSC_HAVE_SCOTCH}
+
+-EXTERNAL_LIB = ${MPE_LIB} ${BLOCKSOLVE_LIB} ${PVODE_LIB} ${PARMETIS_LIB} \
++EXTERNAL_LIB = ${MPE_LIB} ${PARMETIS_LIB} ${PVODE_LIB} ${BLOCKSOLVE_LIB} \
+ ${AMS_LIB} ${SPAI_LIB} ${X11_LIB} ${MATLAB_LIB} \
+ ${LUSOL_LIB} ${DSCPACK_LIB} \
+ ${RAMG_LIB} ${TAU_LIB} ${ADIFOR_LIB} \
diff --git a/math/petsc/files/patch-makefile b/math/petsc/files/patch-makefile
new file mode 100644
index 000000000000..29cc50265d3e
--- /dev/null
+++ b/math/petsc/files/patch-makefile
@@ -0,0 +1,58 @@
+--- makefile.orig Wed Sep 22 02:57:28 2004
++++ makefile Sun Oct 3 00:26:00 2004
+@@ -6,6 +6,7 @@
+ ALL: all
+ LOCDIR = .
+ DIRS = src include
++DOCS_DIR = ${INSTALL_DIR}/../share/doc/petsc
+
+ include ${PETSC_DIR}/bmake/common/base
+ include ${PETSC_DIR}/bmake/common/test
+@@ -224,7 +225,7 @@
+ echo "BOPT=$$BOPT" > ${PETSC_DIR}/bmake/common/bopt_ ;\
+ fi
+ install:
+- -@if [ "${INSTALL_DIR}" == "${PETSC_DIR}" ]; then \
++ -@if [ "${INSTALL_DIR}" = "${PETSC_DIR}" ]; then \
+ echo "Install directory is current directory; nothing needs to be done";\
+ else \
+ echo Installing PETSc at ${INSTALL_DIR};\
+@@ -258,11 +259,11 @@
+ done;\
+ echo "sh/bash: PETSC_DIR="${INSTALL_DIR}"; export PETSC_DIR";\
+ echo "csh/tcsh: setenv PETSC_DIR "${INSTALL_DIR} ;\
+- echo "The do make test to verify correct install";\
++ echo "Then do make test to verify correct install";\
+ fi;
+
+ install_src:
+- -@if [ "${INSTALL_DIR}" == "${PETSC_DIR}" ]; then \
++ -@if [ "${INSTALL_DIR}" = "${PETSC_DIR}" ]; then \
+ echo "You did not set a directory to install to";\
+ else \
+ echo Installing PETSc source at ${INSTALL_DIR};\
+@@ -276,17 +277,17 @@
+ fi;
+
+ install_docs:
+- -@if [ "${INSTALL_DIR}" == "${PETSC_DIR}" ]; then \
++ -@if [ "${INSTALL_DIR}" = "${PETSC_DIR}" ]; then \
+ echo "You did not set a directory to install to";\
+ else \
+- echo Installing PETSc documentation at ${INSTALL_DIR};\
+- if [ ! -d `dirname ${INSTALL_DIR}` ]; then \
+- ${MKDIR} `dirname ${INSTALL_DIR}` ; \
++ echo Installing PETSc documentation at ${DOCS_DIR};\
++ if [ ! -d `dirname ${DOCS_DIR}` ]; then \
++ ${MKDIR} `dirname ${DOCS_DIR}` ; \
+ fi;\
+- if [ ! -d ${INSTALL_DIR} ]; then \
+- ${MKDIR} ${INSTALL_DIR} ; \
++ if [ ! -d ${DOCS_DIR} ]; then \
++ ${MKDIR} ${DOCS_DIR} ; \
+ fi;\
+- cp -fr docs ${INSTALL_DIR};\
++ cp -fr docs/* ${DOCS_DIR};\
+ ${RM} -fr docs/tex;\
+ fi;
+ # ------------------------------------------------------------------
diff --git a/math/petsc/files/patch-python::PETSc::packages::Spooles.py b/math/petsc/files/patch-python::PETSc::packages::Spooles.py
new file mode 100644
index 000000000000..2b4d626472c8
--- /dev/null
+++ b/math/petsc/files/patch-python::PETSc::packages::Spooles.py
@@ -0,0 +1,12 @@
+--- ./python/PETSc/packages/Spooles.py.orig Wed Sep 22 02:45:51 2004
++++ ./python/PETSc/packages/Spooles.py Tue Sep 28 23:09:00 2004
+@@ -71,7 +71,8 @@
+ if 'with-'+self.package+'-lib' in self.framework.argDB: #~spooles-2.2/MPI/src/spoolesMPI.a ~spooles-2.2/spooles.a
+ lib = self.framework.argDB['with-'+self.package+'-lib']
+ (lib_mpi,dummy) = os.path.split(lib)
+- lib_mpi = os.path.join(lib_mpi,'MPI/src/spoolesMPI.a')
++ # FreeBSD: MPI is included in our spooles.a
++ #lib_mpi = os.path.join(lib_mpi,'MPI/src/spoolesMPI.a')
+ yield ('User specified '+self.PACKAGE+' library',lib_mpi,lib)
+ elif 'with-'+self.package+'-include' in self.framework.argDB:
+ dir = self.framework.argDB['with-'+self.package+'-include'] #~spooles-2.2
diff --git a/math/petsc/files/patch-python::PETSc::packages::X11.py b/math/petsc/files/patch-python::PETSc::packages::X11.py
new file mode 100644
index 000000000000..3ecac3113c25
--- /dev/null
+++ b/math/petsc/files/patch-python::PETSc::packages::X11.py
@@ -0,0 +1,27 @@
+--- python/PETSc/packages/X11.py.orig Wed Sep 22 02:45:51 2004
++++ python/PETSc/packages/X11.py Sat Oct 2 00:27:14 2004
+@@ -26,7 +26,7 @@
+ import nargs
+ help.addArgument('X11', '-with-x=<bool>', nargs.ArgBool(None, 1, 'Activate X11'))
+ help.addArgument('X11', '-with-x-include=<include dir>', nargs.ArgDir(None, None, 'Specify an include directory for X11'))
+- help.addArgument('X11', '-with-x-lib=<X11 lib>', nargs.Arg(None, None, 'Specify X11 library file'))
++ help.addArgument('X11', '-with-x-library=<X11 lib>', nargs.Arg(None, None, 'Specify X11 library file'))
+ return
+
+ def generateGuesses(self):
+@@ -123,6 +123,7 @@
+ if not os.path.isdir(self.framework.argDB['with-x-include']):
+ raise RuntimeError('Invalid X include directory specified by --with-x-include='+os.path.abspath(self.framework.argDB['with-x-include']))
+ includeDir = self.framework.argDB['with-x-include']
++ foundInclude = 1
+ else:
+ testInclude = 'X11/Intrinsic.h'
+
+@@ -144,6 +145,7 @@
+ if not os.path.isfile(self.framework.argDB['with-x-library']):
+ raise RuntimeError('Invalid X library specified by --with-x-library='+os.path.abspath(self.framework.argDB['with-x-library']))
+ libraryDir = os.path.dirname(self.framework.argDB['with-x-library'])
++ foundLibrary = 1
+ else:
+ testLibrary = 'Xt'
+ testFunction = 'XtMalloc'
diff --git a/math/petsc/files/patch-src::mat::impls::rowbs::mpi::mpirowbs.h b/math/petsc/files/patch-src::mat::impls::rowbs::mpi::mpirowbs.h
new file mode 100644
index 000000000000..4deb3db1d37b
--- /dev/null
+++ b/math/petsc/files/patch-src::mat::impls::rowbs::mpi::mpirowbs.h
@@ -0,0 +1,13 @@
+--- src/mat/impls/rowbs/mpi/mpirowbs.h.orig Sat Oct 2 09:13:29 2004
++++ src/mat/impls/rowbs/mpi/mpirowbs.h Tue Oct 5 21:58:07 2004
+@@ -5,8 +5,8 @@
+ #include "src/mat/matimpl.h"
+
+ EXTERN_C_BEGIN
+-#include "BSsparse.h"
+-#include "BSprivate.h"
++#include <BSsparse.h>
++#include <BSprivate.h>
+ EXTERN_C_END
+
+ /*
diff --git a/math/petsc/files/pkg-message.in b/math/petsc/files/pkg-message.in
new file mode 100644
index 000000000000..9e26616e140e
--- /dev/null
+++ b/math/petsc/files/pkg-message.in
@@ -0,0 +1,5 @@
+===================================================
+Before using PETSc, you'll have to set PETSC_DIR to
+%%PETSC_DIR%%
+and eventually PETSC_ARCH to %%PETSC_ARCH%%.
+===================================================