diff options
| author | kinagaki-fj <77097631+kinagaki-fj@users.noreply.github.com> | 2024-02-12 18:11:26 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-12 10:11:26 +0100 |
| commit | adb0757f7251920535fcb707b2ffa3291eb73ac4 (patch) | |
| tree | 2fa2af9f7358edf58ae3b202cca5381bd99c5418 /var | |
| parent | 2369a8f4e5bbf1350e5fce24d770971222d02949 (diff) | |
| download | spack-adb0757f7251920535fcb707b2ffa3291eb73ac4.tar.gz spack-adb0757f7251920535fcb707b2ffa3291eb73ac4.tar.bz2 spack-adb0757f7251920535fcb707b2ffa3291eb73ac4.tar.xz spack-adb0757f7251920535fcb707b2ffa3291eb73ac4.zip | |
blitz: fix for fujitsu compiler (#42307)
Co-authored-by: m-shunji <m.shunji@fujitsu.com>
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/blitz/fujitsu_compiler_specfic_header.patch | 37 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/blitz/package.py | 7 |
2 files changed, 44 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/blitz/fujitsu_compiler_specfic_header.patch b/var/spack/repos/builtin/packages/blitz/fujitsu_compiler_specfic_header.patch new file mode 100644 index 0000000000..5ab4bf490b --- /dev/null +++ b/var/spack/repos/builtin/packages/blitz/fujitsu_compiler_specfic_header.patch @@ -0,0 +1,37 @@ +diff -Nur spack-src.org/blitz/bzconfig.h spack-src/blitz/bzconfig.h +--- spack-src.org/blitz/bzconfig.h 2019-10-02 07:50:17.000000000 +0900 ++++ spack-src/blitz/bzconfig.h 2023-05-25 15:13:47.000000000 +0900 +@@ -77,6 +77,10 @@ + /* Pathscale pathCC compiler */ + #include <blitz/pathscale/bzconfig.h> + ++#elif defined(__FUJITSU) ++/* Fujitsu FCC compiler */ ++#include <blitz/fujitsu/bzconfig.h> ++ + #elif defined(__clang__) + /* clang compiler */ + #include <blitz/llvm/bzconfig.h> +@@ -93,10 +97,6 @@ + /* KAI KCC compiler */ + #include <blitz/kai/bzconfig.h> + +-#elif defined(__FUJITSU) +-/* Fujitsu FCC compiler */ +-#include <blitz/fujitsu/bzconfig.h> +- + /* Add other compilers here */ + + #else +diff -Nur spack-src.org/m4/ac_compiler_specific_header.m4 spack-src/m4/ac_compiler_specific_header.m4 +--- spack-src.org/m4/ac_compiler_specific_header.m4 2019-10-02 07:50:17.000000000 +0900 ++++ spack-src/m4/ac_compiler_specific_header.m4 2023-05-25 15:13:06.000000000 +0900 +@@ -21,7 +21,7 @@ + [COMPILER_VENDOR="gnu"])], + [*KCC*], [COMPILER_VENDOR="kai"], + [*pgCC*], [COMPILER_VENDOR="pgi"], +-dnl [*FCC*], [COMPILER_VENDOR="fujitsu"], ++ [*FCC*], [COMPILER_VENDOR="fujitsu"], + [*pathCC*], [COMPILER_VENDOR="pathscale"], + [*CC*], [AS_CASE([$target], + [*sgi*], [COMPILER_VENDOR="sgi"], diff --git a/var/spack/repos/builtin/packages/blitz/package.py b/var/spack/repos/builtin/packages/blitz/package.py index 5cba944af7..2ef254bd1c 100644 --- a/var/spack/repos/builtin/packages/blitz/package.py +++ b/var/spack/repos/builtin/packages/blitz/package.py @@ -17,6 +17,13 @@ class Blitz(AutotoolsPackage): version("1.0.2", sha256="500db9c3b2617e1f03d0e548977aec10d36811ba1c43bb5ef250c0e3853ae1c2") depends_on("python@3:", type="build") + depends_on("m4", type="build") + depends_on("autoconf", type="build") + depends_on("automake", type="build") + depends_on("libtool", type="build") + + # Fix makefile and include to build with Fujitsu compiler + patch("fujitsu_compiler_specfic_header.patch", when="%fj") build_targets = ["lib"] |