diff options
Diffstat (limited to 'var/spack/repos/builtin/packages/libsigsegv')
| -rw-r--r-- | var/spack/repos/builtin/packages/libsigsegv/new_config_guess.patch (renamed from var/spack/repos/builtin/packages/libsigsegv/patch.new_config_guess) | 0 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/libsigsegv/package.py | 10 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/libsigsegv/ppc.patch | 10 |
3 files changed, 7 insertions, 13 deletions
diff --git a/var/spack/repos/builtin/packages/libsigsegv/patch.new_config_guess b/var/spack/repos/builtin/packages/libsigsegv/new_config_guess.patch index 3ecc7458f7..3ecc7458f7 100644 --- a/var/spack/repos/builtin/packages/libsigsegv/patch.new_config_guess +++ b/var/spack/repos/builtin/packages/libsigsegv/new_config_guess.patch diff --git a/var/spack/repos/builtin/packages/libsigsegv/package.py b/var/spack/repos/builtin/packages/libsigsegv/package.py index 550c602e92..866e196ee8 100644 --- a/var/spack/repos/builtin/packages/libsigsegv/package.py +++ b/var/spack/repos/builtin/packages/libsigsegv/package.py @@ -23,8 +23,12 @@ class Libsigsegv(AutotoolsPackage, GNUMirrorPackage): version("2.11", sha256="dd7c2eb2ef6c47189406d562c1dc0f96f2fc808036834d596075d58377e37a18") version("2.10", sha256="8460a4a3dd4954c3d96d7a4f5dd5bc4d9b76f5754196aa245287553b26d2199a") - patch("patch.new_config_guess", when="@2.10") - patch('ppc.patch') + depends_on("c", type="build") # generated + + patch("new_config_guess.patch", when="@2.10") + + def patch(self): + filter_file("uc_mcontext\.uc_regs->gregs\[1]", "uc_mcontext.gregs[1]", "src/fault-linux-powerpc.h") def configure_args(self): return ["--enable-shared"] @@ -35,7 +39,7 @@ class Libsigsegv(AutotoolsPackage, GNUMirrorPackage): def setup_tests(self): """Copy the build test files after the package is installed to an install test subdirectory for use during `spack test run`.""" - self.cache_extra_test_sources(self.extra_install_tests) + cache_extra_test_sources(self, self.extra_install_tests) def test_smoke_test(self): """build and run smoke test""" diff --git a/var/spack/repos/builtin/packages/libsigsegv/ppc.patch b/var/spack/repos/builtin/packages/libsigsegv/ppc.patch deleted file mode 100644 index 75e10a45fe..0000000000 --- a/var/spack/repos/builtin/packages/libsigsegv/ppc.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- libsigsegv-2.12/src/fault-linux-powerpc.h.old 2017-03-04 15:28:15.000000000 +0000 -+++ libsigsegv-2.12/src/fault-linux-powerpc.h 2020-05-11 21:49:56.190783142 +0000 -@@ -33,6 +33,6 @@ - # 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 |