diff options
| author | t-nojiri <68096132+t-nojiri@users.noreply.github.com> | 2020-09-10 23:56:19 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-10 09:56:19 -0500 |
| commit | e13e2b0d54b61bc0d47d71eb17c7d79d3ce4d5e5 (patch) | |
| tree | 7d4c4987248d491215ad7f780d6a13017160ccc1 | |
| parent | 25291cf01c6f707ee6e50359d7aa2097e6022c08 (diff) | |
| download | spack-e13e2b0d54b61bc0d47d71eb17c7d79d3ce4d5e5.tar.gz spack-e13e2b0d54b61bc0d47d71eb17c7d79d3ce4d5e5.tar.bz2 spack-e13e2b0d54b61bc0d47d71eb17c7d79d3ce4d5e5.tar.xz spack-e13e2b0d54b61bc0d47d71eb17c7d79d3ce4d5e5.zip | |
prism: support for aarch64 (#18562)
* prism: support for aarch64
* prism: Change patch file.
| -rw-r--r-- | var/spack/repos/builtin/packages/prism/Makefile.patch | 35 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/prism/package.py | 2 |
2 files changed, 37 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/prism/Makefile.patch b/var/spack/repos/builtin/packages/prism/Makefile.patch new file mode 100644 index 0000000000..18d68fff4c --- /dev/null +++ b/var/spack/repos/builtin/packages/prism/Makefile.patch @@ -0,0 +1,35 @@ +--- spack-src/prism/Makefile.bak 2019-04-19 07:53:32.000000000 +0900 ++++ spack-src/prism/Makefile 2020-09-08 15:22:09.775733701 +0900 +@@ -66,6 +66,9 @@ + ifneq (,$(findstring ia64, $(shell uname -m))) + ARCH = ia64 + endif ++ ifneq (,$(findstring aarch64, $(shell uname -m))) ++ ARCH = aarch64 ++ endif + endif + # For Mac/Windows, we decide whether to build in 64-bit mode based on + # whether java is 32/64-bit (since these need to match) +@@ -173,6 +176,14 @@ + LDFLAGS = $(CUDD_XCFLAGS) $(OPTIMISE) + BINDISTSUFFIX = linux64 + else ++ ifeq ($(ARCH),aarch64) ++ # Position Independent Code required on Aarch64 ++ CUDD_XCFLAGS = -fPIC -DPIC -DHAVE_IEEE_754 -DBSD -DSIZEOF_VOID_P=8 -DSIZEOF_LONG=8 $(DEBUG) $(WARNINGS) ++ CFLAGS = $(CUDD_XCFLAGS) $(OPTIMISE) ++ CPPFLAGS = --std=c++11 $(CUDD_XCFLAGS) $(OPTIMISE) ++ LDFLAGS = $(CUDD_XCFLAGS) $(OPTIMISE) ++ BINDISTSUFFIX = linux64 ++ else + CUDD_XCFLAGS = -m32 -malign-double -DHAVE_IEEE_754 -DBSD $(DEBUG) $(WARNINGS) + CFLAGS = $(CUDD_XCFLAGS) $(OPTIMISE) + CPPFLAGS = --std=c++11 $(CUDD_XCFLAGS) $(OPTIMISE) +@@ -180,6 +191,7 @@ + BINDISTSUFFIX = linux32 + endif + endif ++ endif + BIN_TARGETS=prism.linux xprism.linux + JFLAGS = -encoding UTF8 + SHARED = -shared diff --git a/var/spack/repos/builtin/packages/prism/package.py b/var/spack/repos/builtin/packages/prism/package.py index a76f33ac7a..bc336c3174 100644 --- a/var/spack/repos/builtin/packages/prism/package.py +++ b/var/spack/repos/builtin/packages/prism/package.py @@ -19,6 +19,8 @@ class Prism(MakefilePackage): depends_on('java', type=('build', 'run')) + patch('Makefile.patch', when='target=aarch64:') + def setup_run_environment(self, env): env.set('PRISM_DIR', self.prefix) |