zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

blitz: fix for fujitsu compiler (#42307)

Browse Source 
Co-authored-by: m-shunji <m.shunji@fujitsu.com>
This commit is contained in:
kinagaki-fj 2024-02-12 18:11:26 +09:00 committed by GitHub
parent 2369a8f4e5
commit adb0757f72
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
var/spack/repos/builtin/packages/blitz/fujitsu_compiler_specfic_header.patch Normal file
View File

@ -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"],

7
var/spack/repos/builtin/packages/blitz/package.py
View File

@ -17,6 +17,13 @@ class Blitz(AutotoolsPackage):
version("1.0.2", sha256="500db9c3b2617e1f03d0e548977aec10d36811ba1c43bb5ef250c0e3853ae1c2") version("1.0.2", sha256="500db9c3b2617e1f03d0e548977aec10d36811ba1c43bb5ef250c0e3853ae1c2")
depends_on("python@3:", type="build") 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"] build_targets = ["lib"]