diff options
| author | Toyohisa Kameyama <kameyama@riken.jp> | 2019-07-24 06:48:25 +0900 |
|---|---|---|
| committer | Adam J. Stewart <ajstewart426@gmail.com> | 2019-07-23 16:48:25 -0500 |
| commit | 6b07407cd020e679d6a5598019231c8328239871 (patch) | |
| tree | a0a692d69e1e0668db8c8d88ba49f6a8e9083cd8 | |
| parent | 39139b9db8685528cc09c46c96138cc8536f0496 (diff) | |
| download | spack-6b07407cd020e679d6a5598019231c8328239871.tar.gz spack-6b07407cd020e679d6a5598019231c8328239871.tar.bz2 spack-6b07407cd020e679d6a5598019231c8328239871.tar.xz spack-6b07407cd020e679d6a5598019231c8328239871.zip | |
isaac-server: Don't add -march=native on ARM and gcc 5.x or before. (#12042)
| -rwxr-xr-x | var/spack/repos/builtin/packages/isaac-server/arm.patch | 18 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/isaac-server/package.py | 1 |
2 files changed, 19 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/isaac-server/arm.patch b/var/spack/repos/builtin/packages/isaac-server/arm.patch new file mode 100755 index 0000000000..895fa3d57f --- /dev/null +++ b/var/spack/repos/builtin/packages/isaac-server/arm.patch @@ -0,0 +1,18 @@ +diff -ru spack-src/server/CMakeLists.txt spack-src.new/server/CMakeLists.txt +--- spack-src/server/CMakeLists.txt 2018-06-12 23:00:55.000000000 +0900 ++++ spack-src.new/server/CMakeLists.txt 2019-07-16 19:05:23.842478919 +0900 +@@ -84,7 +84,13 @@ + add_definitions(-DISAAC_JPEG) + endif (ISAAC_JPEG) + +-add_definitions(-std=c++11 -march=native -mtune=native) ++if (CMAKE_SYSTEM_PROCESSOR STREQUAL aarch64 AND ++ CMAKE_C_COMPILER_ID STREQUAL GNU AND ++ CMAKE_C_COMPILER_VERSION VERSION_LESS 6.0) ++ add_definitions(-std=c++11) ++else () ++ add_definitions(-std=c++11 -march=native -mtune=native) ++endif () + + add_executable(isaac ${HDRS} ${SRCS}) + diff --git a/var/spack/repos/builtin/packages/isaac-server/package.py b/var/spack/repos/builtin/packages/isaac-server/package.py index c1bce9e070..9ebe391a14 100644 --- a/var/spack/repos/builtin/packages/isaac-server/package.py +++ b/var/spack/repos/builtin/packages/isaac-server/package.py @@ -35,5 +35,6 @@ class IsaacServer(CMakePackage): # https://github.com/ComputationalRadiationPhysics/isaac/pull/70 patch('jpeg.patch', when='@:1.3.1') + patch('arm.patch', when='@:1.4.0 target=aarch64') root_cmakelists_dir = 'server' |