summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomoyasu Nojiri <68096132+t-nojiri@users.noreply.github.com>2021-04-08 23:16:30 +0900
committerGitHub <noreply@github.com>2021-04-08 16:16:30 +0200
commita0f9ffd80cdca913e0e0ae7f2c1ffa1d100998b2 (patch)
tree6088eaf6691fcd4d670c653daf4bdfa6883d4d8a
parent68cec598dcd801763a5b3ec957ad79927ac52012 (diff)
downloadspack-a0f9ffd80cdca913e0e0ae7f2c1ffa1d100998b2.tar.gz
spack-a0f9ffd80cdca913e0e0ae7f2c1ffa1d100998b2.tar.bz2
spack-a0f9ffd80cdca913e0e0ae7f2c1ffa1d100998b2.tar.xz
spack-a0f9ffd80cdca913e0e0ae7f2c1ffa1d100998b2.zip
manta: make it build on aarch64 (#22630)
-rw-r--r--var/spack/repos/builtin/packages/manta/for_aarch64.patch11
-rw-r--r--var/spack/repos/builtin/packages/manta/package.py2
2 files changed, 13 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/manta/for_aarch64.patch b/var/spack/repos/builtin/packages/manta/for_aarch64.patch
new file mode 100644
index 0000000000..86364108e6
--- /dev/null
+++ b/var/spack/repos/builtin/packages/manta/for_aarch64.patch
@@ -0,0 +1,11 @@
+--- spack-src/src/cmake/boost.cmake.bak 2019-06-29 07:04:47.000000000 +0900
++++ spack-src/src/cmake/boost.cmake 2021-03-30 11:36:39.000000000 +0900
+@@ -168,6 +168,8 @@
+ message (FATAL_ERROR "Failed to unpack boost library ${THIS_BOOST_VERSION}")
+ endif ()
+ execute_process(
++ COMMAND "sed" -i "s/-m64//g" ${BOOST_BUILD_DIR}/boost_1_58_0/tools/build/src/tools/gcc.jam)
++ execute_process(
+ COMMAND ${CMAKE_COMMAND} -E touch "${BOOST_BUILD_DIR}/boost_unpack_complete")
+ endif ()
+
diff --git a/var/spack/repos/builtin/packages/manta/package.py b/var/spack/repos/builtin/packages/manta/package.py
index 2fbed3827d..7dfcc39722 100644
--- a/var/spack/repos/builtin/packages/manta/package.py
+++ b/var/spack/repos/builtin/packages/manta/package.py
@@ -22,3 +22,5 @@ class Manta(CMakePackage):
depends_on('cmake@2.8.12:', type='build')
depends_on('python@2.7.0:2.7.999', type=('build', 'run'))
depends_on('zlib')
+
+ patch('for_aarch64.patch', when='target=aarch64:')