summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorh-denpo <57649496+h-denpo@users.noreply.github.com>2020-08-13 15:16:23 +0900
committerGitHub <noreply@github.com>2020-08-13 08:16:23 +0200
commit5512340a51f015a3655492f749db0f671621cd42 (patch)
treed3dbd9b1be2c4bc9f91275fa205bffbccc8b3ca8 /var
parentae23f33a31bfbb8b83ba6c73d97635de1ebd75ec (diff)
downloadspack-5512340a51f015a3655492f749db0f671621cd42.tar.gz
spack-5512340a51f015a3655492f749db0f671621cd42.tar.bz2
spack-5512340a51f015a3655492f749db0f671621cd42.tar.xz
spack-5512340a51f015a3655492f749db0f671621cd42.zip
gotcha: fixed building v0.0.2 on ARM (#18012)
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/gotcha/arm.patch19
-rw-r--r--var/spack/repos/builtin/packages/gotcha/package.py5
2 files changed, 4 insertions, 20 deletions
diff --git a/var/spack/repos/builtin/packages/gotcha/arm.patch b/var/spack/repos/builtin/packages/gotcha/arm.patch
deleted file mode 100644
index 0790c257b5..0000000000
--- a/var/spack/repos/builtin/packages/gotcha/arm.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 6f494384b0f00513d950b94a60c14ad1c20eb353
-Author: David Poliakoff <david.poliakoff@gmail.com>
-Date: Thu Sep 20 10:59:54 2018 -0700
-
- Pushed fix to help build on ARM systems
-
-diff --git a/src/libc_wrappers.c b/src/libc_wrappers.c
-index 504e31a..5937e5a 100644
---- a/src/libc_wrappers.c
-+++ b/src/libc_wrappers.c
-@@ -358,7 +358,7 @@ int gotcha_open(const char *pathname, int flags, ...)
- }
- va_end(args);
-
-- result = syscall(SYS_open, pathname, flags, mode);
-+ result = syscall(SYS_openat, AT_FDCWD, pathname, flags, mode);
- if (result >= 0)
- return (int) result;
-
diff --git a/var/spack/repos/builtin/packages/gotcha/package.py b/var/spack/repos/builtin/packages/gotcha/package.py
index f0cb3a7233..7c78f6c300 100644
--- a/var/spack/repos/builtin/packages/gotcha/package.py
+++ b/var/spack/repos/builtin/packages/gotcha/package.py
@@ -20,7 +20,10 @@ class Gotcha(CMakePackage):
version('0.0.2', tag='0.0.2')
variant('test', default=False, description='Build tests for Gotcha')
- patch('arm.patch', when='@1.0.2')
+ patch(
+ 'https://github.com/LLNL/GOTCHA/commit/e82b4a1ecb634075d8f5334b796c888c86da0427.patch',
+ sha256='9f7814fd3c3362c156bc617c755e7e50c2f9125ed4540e36f60e4d93884f1ce6',
+ when='@0.0.2:1.0.2')
def configure_args(self):
spec = self.spec