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::rules.shared.basic9
-rw-r--r--math/petsc/files/patch-bmake::common::variables20
-rw-r--r--math/petsc/files/patch-makefile43
-rw-r--r--math/petsc/files/patch-python::PETSc::packages::Spooles.py12
-rw-r--r--math/petsc/files/patch-python::PETSc::packages::X11.py22
-rw-r--r--math/petsc/files/patch-python_PETSc_packages_spooles.py12
6 files changed, 27 insertions, 91 deletions
diff --git a/math/petsc/files/patch-bmake::common::rules.shared.basic b/math/petsc/files/patch-bmake::common::rules.shared.basic
index c41739226ead..0b999dfd67ca 100644
--- a/math/petsc/files/patch-bmake::common::rules.shared.basic
+++ b/math/petsc/files/patch-bmake::common::rules.shared.basic
@@ -1,11 +1,10 @@
---- bmake/common/rules.shared.basic.orig Tue Nov 16 18:08:11 2004
-+++ bmake/common/rules.shared.basic Tue Aug 30 22:21:17 2005
-@@ -10,6 +10,8 @@
+--- bmake/common/rules.shared.basic.orig Thu Aug 11 01:08:40 2005
++++ bmake/common/rules.shared.basic Wed Sep 14 21:27:05 2005
+@@ -9,6 +9,7 @@
shared_solaris2: shared_solaris
+shared_freebsd7: shared_freebsd
-+shared_freebsd6: shared_freebsd
+ shared_freebsd6: shared_freebsd
shared_freebsd5: shared_freebsd
shared_freebsd4: shared_freebsd
- shared_freebsd3: shared_freebsd
diff --git a/math/petsc/files/patch-bmake::common::variables b/math/petsc/files/patch-bmake::common::variables
deleted file mode 100644
index ce3c2697254e..000000000000
--- a/math/petsc/files/patch-bmake::common::variables
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./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
index 29cc50265d3e..df0143182fbb 100644
--- a/math/petsc/files/patch-makefile
+++ b/math/petsc/files/patch-makefile
@@ -1,42 +1,15 @@
---- makefile.orig Wed Sep 22 02:57:28 2004
-+++ makefile Sun Oct 3 00:26:00 2004
+--- makefile.orig Thu Aug 11 01:33:48 2005
++++ makefile Sun Aug 21 22:58:52 2005
@@ -6,6 +6,7 @@
ALL: all
- LOCDIR = .
- DIRS = src include
+ LOCDIR = .
+ DIRS = src include
+DOCS_DIR = ${INSTALL_DIR}/../share/doc/petsc
+ CFLAGS =
+ FFLAGS =
- 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 \
+@@ -247,14 +248,14 @@
+ -@if [ "${INSTALL_DIR}" = "${PETSC_DIR}" ]; then \
echo "You did not set a directory to install to";\
else \
- echo Installing PETSc documentation at ${INSTALL_DIR};\
diff --git a/math/petsc/files/patch-python::PETSc::packages::Spooles.py b/math/petsc/files/patch-python::PETSc::packages::Spooles.py
deleted file mode 100644
index 2b4d626472c8..000000000000
--- a/math/petsc/files/patch-python::PETSc::packages::Spooles.py
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./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
index 3ecac3113c25..981840edbf20 100644
--- a/math/petsc/files/patch-python::PETSc::packages::X11.py
+++ b/math/petsc/files/patch-python::PETSc::packages::X11.py
@@ -1,5 +1,5 @@
---- 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
+--- python/PETSc/packages/X11.py.orig Thu Aug 11 01:08:41 2005
++++ python/PETSc/packages/X11.py Sun Aug 21 23:06:02 2005
@@ -26,7 +26,7 @@
import nargs
help.addArgument('X11', '-with-x=<bool>', nargs.ArgBool(None, 1, 'Activate X11'))
@@ -8,20 +8,4 @@
+ 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'
+ def setupDependencies(self, framework):
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..9184ce43136b
--- /dev/null
+++ b/math/petsc/files/patch-python_PETSc_packages_spooles.py
@@ -0,0 +1,12 @@
+--- ./python/PETSc/packages/spooles.py.orig Thu Aug 11 01:08:42 2005
++++ ./python/PETSc/packages/spooles.py Sun Aug 21 23:04:09 2005
+@@ -11,7 +11,8 @@
+ self.download = ['ftp://ftp.mcs.anl.gov/pub/petsc/externalpackages/spooles-2.2.tar.gz']
+ self.functions = ['InpMtx_init']
+ self.includes = ['MPI/spoolesMPI.h']
+- self.liblist = [[os.path.join('MPI','src','spoolesMPI.a'),'spooles.a']]
++ # FreeBSD: MPI is included in our spooles.a
++ # self.liblist = [[os.path.join('MPI','src','spoolesMPI.a'),'spooles.a']]
+ self.libdir = ''
+ self.includedir = ''
+ return
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-06 11:01:31 +0000