diff options
| author | Toyohisa Kameyama <kameyama@riken.jp> | 2019-07-12 09:40:00 +0900 |
|---|---|---|
| committer | Peter Scheibel <scheibel1@llnl.gov> | 2019-07-11 17:40:00 -0700 |
| commit | 0dfa5a467c188c040fcc70bc75a5f69da3a2cbd4 (patch) | |
| tree | 0f18d0826b4d139fc045ddf1b22698e32f7fa79d /var | |
| parent | 05b6a5e53dc655b98fc5c300094764b7a3b6b470 (diff) | |
| download | spack-0dfa5a467c188c040fcc70bc75a5f69da3a2cbd4.tar.gz spack-0dfa5a467c188c040fcc70bc75a5f69da3a2cbd4.tar.bz2 spack-0dfa5a467c188c040fcc70bc75a5f69da3a2cbd4.tar.xz spack-0dfa5a467c188c040fcc70bc75a5f69da3a2cbd4.zip | |
megahit package: add patch to build on ARM. (#11963)
Diffstat (limited to 'var')
| -rwxr-xr-x | var/spack/repos/builtin/packages/megahit/amd.patch | 20 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/megahit/package.py | 2 |
2 files changed, 22 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/megahit/amd.patch b/var/spack/repos/builtin/packages/megahit/amd.patch new file mode 100755 index 0000000000..6f99f616b2 --- /dev/null +++ b/var/spack/repos/builtin/packages/megahit/amd.patch @@ -0,0 +1,20 @@ +Common subdirectories: spack-src/cub and spack-src.mod/cub +Common subdirectories: spack-src/example and spack-src.mod/example +Common subdirectories: spack-src/lib_idba and spack-src.mod/lib_idba +diff -u spack-src/Makefile spack-src.mod/Makefile +--- spack-src/Makefile 2018-11-02 10:14:27.000000000 +0900 ++++ spack-src.mod/Makefile 2019-07-09 15:53:34.685959951 +0900 +@@ -48,6 +48,12 @@ + CPU_ARCH_SUFFIX = ppc64 + CPU_ARCH = -mpowerpc64 + endif ++IS_AARCH64 := $(shell echo `$(CXX) -v 2>&1 | grep aarch64 | wc -l`) ++ifneq (0, $(IS_AARCH64)) ++ CPU_ARCH_SUFFIX = aarch64 ++ CPU_ARCH = ++ disablempopcnt=1 ++endif + + #------------------------------------------------------------------------------- + # Includes +Common subdirectories: spack-src/tools and spack-src.mod/tools diff --git a/var/spack/repos/builtin/packages/megahit/package.py b/var/spack/repos/builtin/packages/megahit/package.py index fe20a70786..64f8d01de6 100644 --- a/var/spack/repos/builtin/packages/megahit/package.py +++ b/var/spack/repos/builtin/packages/megahit/package.py @@ -18,6 +18,8 @@ class Megahit(MakefilePackage): depends_on('zlib') + patch('amd.patch', when='target=aarch64') + def install(self, spec, prefix): mkdirp(prefix.bin) install('megahit', prefix.bin) |