diff --git a/var/spack/repos/builtin/packages/py-petsc4py/ldshared_3190.patch b/var/spack/repos/builtin/packages/py-petsc4py/ldshared_3190.patch new file mode 100644 index 00000000000..7a62595aad4 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-petsc4py/ldshared_3190.patch @@ -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): diff --git a/var/spack/repos/builtin/packages/py-petsc4py/ldshared_319.patch b/var/spack/repos/builtin/packages/py-petsc4py/ldshared_3211.patch similarity index 100% rename from var/spack/repos/builtin/packages/py-petsc4py/ldshared_319.patch rename to var/spack/repos/builtin/packages/py-petsc4py/ldshared_3211.patch diff --git a/var/spack/repos/builtin/packages/py-petsc4py/package.py b/var/spack/repos/builtin/packages/py-petsc4py/package.py index 1946e7b34f6..988ba7b73db 100644 --- a/var/spack/repos/builtin/packages/py-petsc4py/package.py +++ b/var/spack/repos/builtin/packages/py-petsc4py/package.py @@ -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