diff options
| author | Toyohisa Kameyama <kameyama@riken.jp> | 2019-07-25 02:31:49 +0900 |
|---|---|---|
| committer | Adam J. Stewart <ajstewart426@gmail.com> | 2019-07-24 12:31:49 -0500 |
| commit | bbc689ae38da835b2e7d700ca4eb9ccb92daad43 (patch) | |
| tree | 1bd06b3f488ea5d6408ba73dbb9c43c81fc578b9 | |
| parent | cb62b1ff85d8c7b797b0f013820588056f71d8df (diff) | |
| download | spack-bbc689ae38da835b2e7d700ca4eb9ccb92daad43.tar.gz spack-bbc689ae38da835b2e7d700ca4eb9ccb92daad43.tar.bz2 spack-bbc689ae38da835b2e7d700ca4eb9ccb92daad43.tar.xz spack-bbc689ae38da835b2e7d700ca4eb9ccb92daad43.zip | |
nnvm: cmake bug is fixed. (#12113)
| -rwxr-xr-x | var/spack/repos/builtin/packages/nnvm/cmake2.patch | 20 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/nnvm/package.py | 1 |
2 files changed, 21 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/nnvm/cmake2.patch b/var/spack/repos/builtin/packages/nnvm/cmake2.patch new file mode 100755 index 0000000000..5536ca718f --- /dev/null +++ b/var/spack/repos/builtin/packages/nnvm/cmake2.patch @@ -0,0 +1,20 @@ +diff -ru spack-src/CMakeLists.txt spack-src.new/CMakeLists.txt +--- spack-src/CMakeLists.txt 2019-07-24 10:51:47.679702195 +0900 ++++ spack-src.new/CMakeLists.txt 2019-07-24 11:05:21.199748764 +0900 +@@ -38,7 +38,13 @@ + check_cxx_compiler_flag("-std=c++0x" SUPPORT_CXX0X) + check_cxx_compiler_flag("-msse2" SUPPORT_MSSE2) + check_cxx_compiler_flag("-openmp" SUPPORT_OPENMP) +- set(CMAKE_C_FLAGS "-O3 -Wall -msse2 -Wno-unknown-pragmas -std=c++0x -fPIC") ++ set(CMAKE_C_FLAGS "-O3 -Wall -Wno-unknown-pragmas -fPIC") ++ if(SUPPORT_MSSE2) ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse2") ++ endif() ++ if(SUPPORT_CXX0X) ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c++0x") ++ endif() + if(SUPPORT_OPENMP) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fopenmp") + endif() +Only in spack-src.new: CMakeLists.txt.org +Only in spack-src: .git diff --git a/var/spack/repos/builtin/packages/nnvm/package.py b/var/spack/repos/builtin/packages/nnvm/package.py index 87a20c9926..4bf85cfe51 100644 --- a/var/spack/repos/builtin/packages/nnvm/package.py +++ b/var/spack/repos/builtin/packages/nnvm/package.py @@ -21,6 +21,7 @@ class Nnvm(CMakePackage): depends_on('dmlc-core') patch('cmake.patch') + patch('cmake2.patch', when='@20170418') def cmake_args(self): spec = self.spec |