zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

petsc4py: update ldshared.patch for v3.20.1, and skip for v3.23.1+ (#50170)

Browse Source
This commit is contained in:
Satish Balay 2025-04-24 10:50:23 -05:00 committed by GitHub
parent fcf615b53e
commit 4bfd7aeb25
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
var/spack/repos/builtin/packages/py-petsc4py/ldshared_3190.patch Normal file
View File

@ -0,0 +1,11 @@
--- a/conf/confpetsc.py 2023-10-31 00:35:21.000000000 -0500
+++ b/conf/confpetsc.py 2025-04-22 23:56:40.015502466 -0500
@@ -334,7 +334,7 @@
ldshared = getenv('LDSHARED', ldshared)
ldflags = getenv('LDFLAGS', cflags + ' ' + (ldflags or ''))
ldcmd = split_quoted(ld) + split_quoted(ldflags)
- ldshared = [flg for flg in split_quoted(ldshared) if flg not in ldcmd and (flg.find('/lib/spack/env')<0)]
+ ldshared = [flg for flg in split_quoted(ldshared) if flg not in ldcmd and (flg.find('/lib/spack/env')<0) and (flg.find('/libexec/spack')<0)]
ldshared = str.join(' ', ldshared)
#
def get_flags(cmd):

0
var/spack/repos/builtin/packages/py-petsc4py/ldshared_319.patch → var/spack/repos/builtin/packages/py-petsc4py/ldshared_3211.patch
View File

3
var/spack/repos/builtin/packages/py-petsc4py/package.py
View File

@ -95,7 +95,8 @@ class PyPetsc4py(PythonPackage):
# Hack to fix https://github.com/spack/spack/issues/21451, where Petsc4Py expects LDSHARED
# to start with the same executable as get_config_var("CC")
patch("ldshared_319.patch", when="@3.19:")
patch("ldshared_3211.patch", when="@3.21.1:3.23.0")
patch("ldshared_3190.patch", when="@3.19:3.21.0")
patch("ldshared.patch", when="@:3.18")
depends_on("c", type="build") # generated