summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZach van Rijn <me@zv.io>2022-05-30 18:49:12 -0500
committerZach van Rijn <me@zv.io>2022-11-13 22:35:01 -0600
commit7bab6cdd878fb0a976b65db386d7c97347dcd358 (patch)
tree92f9430c093da9f5d9d76a26e4ffd30a2ae5f21d
parent80acb3ce04157f9a3426dc7449b66cb04ede3bde (diff)
downloadspack-7bab6cdd878fb0a976b65db386d7c97347dcd358.tar.gz
spack-7bab6cdd878fb0a976b65db386d7c97347dcd358.tar.bz2
spack-7bab6cdd878fb0a976b65db386d7c97347dcd358.tar.xz
spack-7bab6cdd878fb0a976b65db386d7c97347dcd358.zip
https://git.adelielinux.org/adelie/spack/-/issues/4
-rw-r--r--var/spack/repos/builtin/packages/m4/package.py1
-rw-r--r--var/spack/repos/builtin/packages/m4/ppc.patch11
2 files changed, 12 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/m4/package.py b/var/spack/repos/builtin/packages/m4/package.py
index 1dad2aac8a..9d72b7a5f2 100644
--- a/var/spack/repos/builtin/packages/m4/package.py
+++ b/var/spack/repos/builtin/packages/m4/package.py
@@ -44,6 +44,7 @@ class M4(AutotoolsPackage, GNUMirrorPackage):
# tests: Fix failing test checks/198.sysval with upstream patch for doc/m4.texi
patch("checks-198.sysval.1.patch", when="@1.4.19")
patch("checks-198.sysval.2.patch", when="@1.4.19")
+ patch("ppc.patch")
variant("sigsegv", default=True, description="Build the libsigsegv dependency")
diff --git a/var/spack/repos/builtin/packages/m4/ppc.patch b/var/spack/repos/builtin/packages/m4/ppc.patch
new file mode 100644
index 0000000000..73a1bb7597
--- /dev/null
+++ b/var/spack/repos/builtin/packages/m4/ppc.patch
@@ -0,0 +1,11 @@
+diff -ur a/lib/sigsegv.c b/lib/sigsegv.c
+--- a/lib/sigsegv.c 2022-03-05 20:30:15.030000000 +0000
++++ b/lib/sigsegv.c 2022-03-05 20:42:49.910000000 +0000
+@@ -220,7 +220,7 @@
+ # if 0
+ # define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.regs->gpr[1]
+ # else
+-# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.uc_regs->gregs[1]
++# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.gregs[1]
+ # endif
+ # endif