Skip to content

Commit 4e2723d

Browse files
committed
petsc: update to 3.22.0
1 parent 5f20f30 commit 4e2723d

File tree

3 files changed

+47
-6
lines changed

3 files changed

+47
-6
lines changed
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
diff -urN petsc-3.22.0.orig/config/PETSc/Configure.py petsc-3.22.0/config/PETSc/Configure.py
2+
--- petsc-3.22.0.orig/config/PETSc/Configure.py 2024-09-29 09:06:09.000000000 +0500
3+
+++ petsc-3.22.0/config/PETSc/Configure.py 2024-10-20 11:49:48.162439300 +0500
4+
@@ -150,6 +150,7 @@
5+
'strcasecmp','bzero','dlopen','dlsym','dlclose','dlerror',
6+
'_set_output_format','_mkdir','socket','gethostbyname','fpresetsticky',
7+
'fpsetsticky','__gcov_dump']
8+
+ functions.remove('_set_output_format')
9+
libraries = [(['fpe'],'handle_sigfpes')]
10+
librariessock = [(['socket','nsl'],'socket')]
11+
self.headers.headers.extend(headersC)
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
Binary files petsc-3.22.0.orig/config/BuildSystem/config/101p/libpthread.a and petsc-3.22.0/config/BuildSystem/config/101p/libpthread.a differ
2+
Binary files petsc-3.22.0.orig/config/BuildSystem/config/101p/libpthread.dll.a and petsc-3.22.0/config/BuildSystem/config/101p/libpthread.dll.a differ
3+
Binary files petsc-3.22.0.orig/config/BuildSystem/config/101p/libwinpthread.a and petsc-3.22.0/config/BuildSystem/config/101p/libwinpthread.a differ
4+
Binary files petsc-3.22.0.orig/config/BuildSystem/config/101p/libwinpthread.dll.a and petsc-3.22.0/config/BuildSystem/config/101p/libwinpthread.dll.a differ
5+
diff -urN petsc-3.22.0.orig/config/BuildSystem/config/libraries.py petsc-3.22.0/config/BuildSystem/config/libraries.py
6+
--- petsc-3.22.0.orig/config/BuildSystem/config/libraries.py 2024-09-29 09:06:09.000000000 +0500
7+
+++ petsc-3.22.0/config/BuildSystem/config/libraries.py 2024-10-20 15:47:05.265558500 +0500
8+
@@ -641,6 +641,7 @@
9+
self.logPrint('Using libpthread for the mutex')
10+
self.pthreadmutex = ['libpthread.a']
11+
self.addDefine('HAVE_PTHREAD_MUTEX',1)
12+
+ self.setCompilers.LIBS += ' -lpthread'
13+
else:
14+
self.logPrint('No pthread mutex support found')
15+
return
16+
@@ -666,7 +667,7 @@
17+
self.executeTest(self.checkMathLog2)
18+
self.executeTest(self.checkRealtime)
19+
self.executeTest(self.checkDynamic)
20+
- self.executeTest(self.checkPthreadMutex)
21+
+ if self.argDB['with-pthread']: self.executeTest(self.checkPthreadMutex)
22+
if not self.argDB['with-batch']:
23+
self.executeTest(self.checkExecutableExportFlag)
24+
return

mingw-w64-petsc/PKGBUILD

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
_realname=petsc
3333
pkgbase=mingw-w64-${_realname}
3434
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" "${MINGW_PACKAGE_PREFIX}-${_realname}-build")
35-
pkgver=3.21.5
35+
pkgver=3.22.0
3636
pkgrel=1
3737
pkgdesc='Sparse iterative (non)linear solver package (mingw-w64)'
3838
arch=('any')
@@ -62,16 +62,20 @@ source=("https://web.cels.anl.gov/projects/petsc/download/release-snapshots/${_r
6262
'petsc-mat.test'
6363
'0001-mpi-detection-override.patch'
6464
'0002-openblas-clang.patch'
65-
'0003-pid.patch')
65+
'0003-pid.patch'
66+
'0004-set_output_format.patch'
67+
'0005-with-pthread.patch')
6668
noextract=("${_realname}-lite-${pkgver}.tar.gz")
67-
sha256sums=('4eb1ec04c1a8988bd524f71f8d7d980dc1853d5be8791c0f19f3c09eef71fdd2'
69+
sha256sums=('2c03f7c0f7ad2649240d4989355cf7fb7f211b75156cd7d424e1d9dd7dfb290b'
6870
'ec5072630e1c0309fe383669e9187790cd135a393c67bc4bc35cf60b0ba396ff'
6971
'15c7af25b91406d5fe5f26cfe00963b6cfde1c3dd466eb25f1b6fae299934966'
7072
'7d171b2680211b0a4d305dfb866faf5c995e47d0ecf619d33f1cce3190c32128'
7173
'b1c9c4c4155d10bcf12c5c512df34cd6a781c4c81f6edbc8e331f49c7e10a1f7'
7274
'bef5353d6d10de492c9832f24b41993c38d1b36a78eb55e7d49089ba72acc05a'
7375
'c954cc4240a6f3cebdc40cf4fca07561e58eb50717b9741c296b73657bac1c51'
74-
'08d37a205d7a2ae27ccef41ee931f92c96aa428b94ed633def2f56fdfa6fb11e')
76+
'08d37a205d7a2ae27ccef41ee931f92c96aa428b94ed633def2f56fdfa6fb11e'
77+
'254405c6c0eb5aa57b1cb74bbaf8876bcdb67d63136102e48a8036824bb9f129'
78+
'bd7d1fa888d24f5183de992fb9377a4532cd9f38c5608018f5cd82f61e3096e9')
7579

7680
# Helper macros to help make tasks easier #
7781
apply_patch_with_msg() {
@@ -90,7 +94,9 @@ prepare() {
9094
apply_patch_with_msg \
9195
0001-mpi-detection-override.patch \
9296
0002-openblas-clang.patch \
93-
0003-pid.patch
97+
0003-pid.patch \
98+
0004-set_output_format.patch \
99+
0005-with-pthread.patch
94100
}
95101

96102
# Optimized build flavors
@@ -145,7 +151,7 @@ _petsc() {
145151
;;
146152
?s?)
147153
opts+=" --with-mpi=0 --with-pthread=0 --with-openmp=0"
148-
iflags+=" -I\${includedir}/mpiuni"
154+
iflags+=" -I\${includedir}/mpiuni"
149155
desc="Sequential"
150156
;;
151157
esac

0 commit comments

Comments
 (0)