| 1 |
diff --color --color -aur petsc-3.25.3/config/BuildSystem/config/packages/PTSCOTCH.py petsc-3.25.3-p1/config/BuildSystem/config/packages/PTSCOTCH.py |
| 2 |
--- petsc-3.25.3/config/BuildSystem/config/packages/PTSCOTCH.py 2026-03-16 16:18:25 |
| 3 |
+++ petsc-3.25.3-p1/config/BuildSystem/config/packages/PTSCOTCH.py 2026-03-16 20:02:52 |
| 4 |
@@ -62,4 +62,10 @@ |
| 5 |
|
| 6 |
args.append('-DBUILD_FORTRAN:BOOL=OFF') |
| 7 |
args.append('-DENABLE_TESTS:BOOL=OFF') |
| 8 |
+ mpicc = self.framework.getMakeMacro('MPICC_SHOW') |
| 9 |
+ mpicxx = self.framework.getMakeMacro('MPICXX_SHOW') |
| 10 |
+ if mpicc and mpicxx: |
| 11 |
+ args = self.rmArgsStartsWith(args,['-DCMAKE_CXX_COMPILER','-DCMAKE_C_COMPILER']) |
| 12 |
+ args.append('-DCMAKE_C_COMPILER="'+mpicc.split(None, 1)[0]+'"') |
| 13 |
+ args.append('-DCMAKE_CXX_COMPILER="'+mpicxx.split(None, 1)[0]+'"') |
| 14 |
return args |
| 15 |
diff --color --color -aur petsc-3.25.3/config/BuildSystem/config/packages/SuiteSparse.py petsc-3.25.3-p1/config/BuildSystem/config/packages/SuiteSparse.py |
| 16 |
--- petsc-3.25.3/config/BuildSystem/config/packages/SuiteSparse.py 2026-03-16 16:18:25 |
| 17 |
+++ petsc-3.25.3-p1/config/BuildSystem/config/packages/SuiteSparse.py 2026-03-16 20:02:52 |
| 18 |
@@ -77,4 +77,10 @@ |
| 19 |
args.append('-DSUITESPARSE_USE_OPENMP:BOOL='+('ON' if self.openmp.found else 'OFF')) |
| 20 |
args.append('-DSUITESPARSE_USE_64BIT_BLAS:BOOL='+('ON' if self.blasLapack.has64bitindices else 'OFF')) |
| 21 |
|
| 22 |
+ mpicc = self.framework.getMakeMacro('MPICC_SHOW') |
| 23 |
+ mpicxx = self.framework.getMakeMacro('MPICXX_SHOW') |
| 24 |
+ if mpicc and mpicxx: |
| 25 |
+ args = self.rmArgsStartsWith(args,['-DCMAKE_CXX_COMPILER','-DCMAKE_C_COMPILER']) |
| 26 |
+ args.append('-DCMAKE_C_COMPILER="'+mpicc.split(None, 1)[0]+'"') |
| 27 |
+ args.append('-DCMAKE_CXX_COMPILER="'+mpicxx.split(None, 1)[0]+'"') |
| 28 |
return args |
| 29 |
diff --color --color -aur petsc-3.25.3/config/BuildSystem/config/packages/SuperLU.py petsc-3.25.3-p1/config/BuildSystem/config/packages/SuperLU.py |
| 30 |
--- petsc-3.25.3/config/BuildSystem/config/packages/SuperLU.py 2026-03-16 16:18:25 |
| 31 |
+++ petsc-3.25.3-p1/config/BuildSystem/config/packages/SuperLU.py 2026-03-16 20:02:52 |
| 32 |
@@ -54,4 +54,10 @@ |
| 33 |
if item.find('CMAKE_C_FLAGS') >= 0 or item.find('CMAKE_CXX_FLAGS') >= 0: |
| 34 |
args[place]=item[:-1]+' '+mangledef+'"' |
| 35 |
|
| 36 |
+ mpicc = self.framework.getMakeMacro('MPICC_SHOW') |
| 37 |
+ mpicxx = self.framework.getMakeMacro('MPICXX_SHOW') |
| 38 |
+ if mpicc and mpicxx: |
| 39 |
+ args = self.rmArgsStartsWith(args,['-DCMAKE_CXX_COMPILER','-DCMAKE_C_COMPILER']) |
| 40 |
+ args.append('-DCMAKE_C_COMPILER="'+mpicc.split(None, 1)[0]+'"') |
| 41 |
+ args.append('-DCMAKE_CXX_COMPILER="'+mpicxx.split(None, 1)[0]+'"') |
| 42 |
return args |
| 43 |
diff --color --color -aur petsc-3.25.3/config/BuildSystem/config/packages/METIS.py petsc-3.25.3-p1/config/BuildSystem/config/packages/METIS.py |
| 44 |
--- petsc-3.25.3/config/BuildSystem/config/packages/METIS.py 2025.39-29 15:58:07 |
| 45 |
+++ petsc-3.25.3-p1/config/BuildSystem/config/packages/METIS.py 2026-03-16 20:02:52 |
| 46 |
@@ -45,6 +45,12 @@ |
| 47 |
if self.framework.argDB['download-metis-use-doubleprecision']: |
| 48 |
args.append('-DMETIS_USE_DOUBLEPRECISION=1') |
| 49 |
args.append('-DMATH_LIB="'+self.libraries.toStringNoDupes(self.mathlib.lib)+'"') |
| 50 |
+ mpicc = self.framework.getMakeMacro('MPICC_SHOW') |
| 51 |
+ mpicxx = self.framework.getMakeMacro('MPICXX_SHOW') |
| 52 |
+ if mpicc and mpicxx: |
| 53 |
+ args = self.rmArgsStartsWith(args,['-DCMAKE_CXX_COMPILER','-DCMAKE_C_COMPILER']) |
| 54 |
+ args.append('-DCMAKE_C_COMPILER="'+mpicc.split(None, 1)[0]+'"') |
| 55 |
+ args.append('-DCMAKE_CXX_COMPILER="'+mpicxx.split(None, 1)[0]+'"') |
| 56 |
return args |
| 57 |
|
| 58 |
def configureLibrary(self): |
| 59 |
diff --color --color -aur petsc-3.25.3/config/BuildSystem/config/packages/Mmg.py petsc-3.25.3-p1/config/BuildSystem/config/packages/Mmg.py |
| 60 |
--- petsc-3.25.3/config/BuildSystem/config/packages/Mmg.py 2025.39-29 15:58:07 |
| 61 |
+++ petsc-3.25.3-p1/config/BuildSystem/config/packages/Mmg.py 2026-03-16 20:02:52 |
| 62 |
@@ -29,6 +29,12 @@ |
| 63 |
args.append('-DUSE_VTK=OFF') |
| 64 |
args.append('-DMMG_INSTALL_PRIVATE_HEADERS=ON') |
| 65 |
args.append('-DSCOTCH_DIR:STRING="'+self.ptscotch.directory+'"') |
| 66 |
+ mpicc = self.framework.getMakeMacro('MPICC_SHOW') |
| 67 |
+ mpicxx = self.framework.getMakeMacro('MPICXX_SHOW') |
| 68 |
+ if mpicc and mpicxx: |
| 69 |
+ args = self.rmArgsStartsWith(args,['-DCMAKE_CXX_COMPILER','-DCMAKE_C_COMPILER']) |
| 70 |
+ args.append('-DCMAKE_C_COMPILER="'+mpicc.split(None, 1)[0]+'"') |
| 71 |
+ args.append('-DCMAKE_CXX_COMPILER="'+mpicxx.split(None, 1)[0]+'"') |
| 72 |
if self.getDefaultIndexSize() == 64: |
| 73 |
int64_t = ''' |
| 74 |
#if !(defined(PETSC_HAVE_STDINT_H) && defined(PETSC_HAVE_INTTYPES_H) && defined(PETSC_HAVE_MPI_INT64_T)) |