diff options
| author | Toyohisa Kameyama <kameyama@riken.jp> | 2019-09-07 05:26:24 +0900 |
|---|---|---|
| committer | Greg Becker <becker33@llnl.gov> | 2019-09-06 13:26:24 -0700 |
| commit | 5def1dd39d593db4373d4a6ddd7d9edd44fc2a09 (patch) | |
| tree | cf08784b6cd57d2d8b56f371fccfa2add35f65c7 | |
| parent | 8fe5405e1bf98265253acc43720db9eba5531db2 (diff) | |
| download | spack-5def1dd39d593db4373d4a6ddd7d9edd44fc2a09.tar.gz spack-5def1dd39d593db4373d4a6ddd7d9edd44fc2a09.tar.bz2 spack-5def1dd39d593db4373d4a6ddd7d9edd44fc2a09.tar.xz spack-5def1dd39d593db4373d4a6ddd7d9edd44fc2a09.zip | |
openspeedshop: fixed build on arm. (#11861)
* openspeedshop: fixed build on arm.
* remove patch comment.
4 files changed, 52 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/openspeedshop-utils/arm.patch b/var/spack/repos/builtin/packages/openspeedshop-utils/arm.patch new file mode 100644 index 0000000000..c0099cfd35 --- /dev/null +++ b/var/spack/repos/builtin/packages/openspeedshop-utils/arm.patch @@ -0,0 +1,25 @@ +diff --git a/plugins/views/iot/iot_view.cxx b/plugins/views/iot/iot_view.cxx +index f4cdf48..ef1b81f 100644 +--- a/plugins/views/iot/iot_view.cxx ++++ b/plugins/views/iot/iot_view.cxx +@@ -45,6 +45,20 @@ + # endif + #endif + /* End part 2 of 2 for Hack to get around inconsistent syscall definitions */ ++/* Start Added Hack to get around inconsistent syscall definitions */ ++#ifndef SYS_open ++#define SYS_open SYS_openat ++#endif ++#ifndef SYS_creat ++#define SYS_creat SYS_openat ++#endif ++#ifndef SYS_dup2 ++#define SYS_dup2 SYS_dup3 ++#endif ++#ifndef SYS_pipe ++#define SYS_pipe SYS_pipe2 ++#endif ++/* end Added Hack to get around inconsistent syscall definitions */ + + + diff --git a/var/spack/repos/builtin/packages/openspeedshop-utils/package.py b/var/spack/repos/builtin/packages/openspeedshop-utils/package.py index cec1c92dc3..7f5d134b34 100644 --- a/var/spack/repos/builtin/packages/openspeedshop-utils/package.py +++ b/var/spack/repos/builtin/packages/openspeedshop-utils/package.py @@ -142,6 +142,7 @@ class OpenspeedshopUtils(CMakePackage): depends_on("mrnet@5.0.1-3:+cti", when='@2.3.1.3:9999+cti', type=('build', 'link', 'run')) depends_on("mrnet@5.0.1-3:+lwthreads", when='@2.3.1.3:9999', type=('build', 'link', 'run')) + patch('arm.patch', when='target=aarch64') parallel = False build_directory = 'build_openspeedshop' diff --git a/var/spack/repos/builtin/packages/openspeedshop/arm.patch b/var/spack/repos/builtin/packages/openspeedshop/arm.patch new file mode 100644 index 0000000000..c0099cfd35 --- /dev/null +++ b/var/spack/repos/builtin/packages/openspeedshop/arm.patch @@ -0,0 +1,25 @@ +diff --git a/plugins/views/iot/iot_view.cxx b/plugins/views/iot/iot_view.cxx +index f4cdf48..ef1b81f 100644 +--- a/plugins/views/iot/iot_view.cxx ++++ b/plugins/views/iot/iot_view.cxx +@@ -45,6 +45,20 @@ + # endif + #endif + /* End part 2 of 2 for Hack to get around inconsistent syscall definitions */ ++/* Start Added Hack to get around inconsistent syscall definitions */ ++#ifndef SYS_open ++#define SYS_open SYS_openat ++#endif ++#ifndef SYS_creat ++#define SYS_creat SYS_openat ++#endif ++#ifndef SYS_dup2 ++#define SYS_dup2 SYS_dup3 ++#endif ++#ifndef SYS_pipe ++#define SYS_pipe SYS_pipe2 ++#endif ++/* end Added Hack to get around inconsistent syscall definitions */ + + + diff --git a/var/spack/repos/builtin/packages/openspeedshop/package.py b/var/spack/repos/builtin/packages/openspeedshop/package.py index df737b2fb1..3b88ff8062 100644 --- a/var/spack/repos/builtin/packages/openspeedshop/package.py +++ b/var/spack/repos/builtin/packages/openspeedshop/package.py @@ -141,6 +141,7 @@ class Openspeedshop(CMakePackage): depends_on("mrnet@5.0.1-3:+cti", when='@2.3.1.3:9999+cti', type=('build', 'link', 'run')) depends_on("mrnet@5.0.1-3:+lwthreads", when='@2.3.1.3:9999', type=('build', 'link', 'run')) + patch('arm.patch', when='target=aarch64') parallel = False build_directory = 'build_openspeedshop' |