diff options
| author | Toyohisa Kameyama <kameyama@riken.jp> | 2020-05-28 18:23:15 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-28 11:23:15 +0200 |
| commit | ab65a8ee27451d3a63375ec389ed050bc075db16 (patch) | |
| tree | 67bc8dfa92ab01464880e9793d47cbc79c31ca9a | |
| parent | 87cd375559858c4a311e623ae084a675a4c705ea (diff) | |
| download | spack-ab65a8ee27451d3a63375ec389ed050bc075db16.tar.gz spack-ab65a8ee27451d3a63375ec389ed050bc075db16.tar.bz2 spack-ab65a8ee27451d3a63375ec389ed050bc075db16.tar.xz spack-ab65a8ee27451d3a63375ec389ed050bc075db16.zip | |
opencv: fix to build version 3.2.0 with Fujitsu compiler (#16840)
| -rw-r--r-- | var/spack/repos/builtin/packages/opencv/opencv3.2_fj.patch | 20 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/opencv/package.py | 1 |
2 files changed, 21 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/opencv/opencv3.2_fj.patch b/var/spack/repos/builtin/packages/opencv/opencv3.2_fj.patch new file mode 100644 index 0000000000..dae8af256b --- /dev/null +++ b/var/spack/repos/builtin/packages/opencv/opencv3.2_fj.patch @@ -0,0 +1,20 @@ +diff -ru opencv-3.2.0.org/modules/core/include/opencv2/core/hal/intrin_neon.hpp opencv-3.2.0/modules/core/include/opencv2/core/hal/intrin_neon.hpp +--- opencv-3.2.0.org/modules/core/include/opencv2/core/hal/intrin_neon.hpp 2016-12-23 21:54:44.000000000 +0900 ++++ opencv-3.2.0/modules/core/include/opencv2/core/hal/intrin_neon.hpp 2020-05-27 14:39:11.288700481 +0900 +@@ -282,10 +282,16 @@ + { return (int16x4_t)a; } + template <typename T> static inline float16x4_t vreinterpret_f16_s16(T a) + { return (float16x4_t)a; } ++#ifdef vld1_f16 ++#undef vld1_f16 ++#endif + template <typename T> static inline float16x4_t vld1_f16(const T* ptr) + { return vreinterpret_f16_s16(vld1_s16((const short*)ptr)); } ++#ifdef vst1_f16 ++#undef vst1_f16 ++#endif + template <typename T> static inline void vst1_f16(T* ptr, float16x4_t a) + { vst1_s16((short*)ptr, vreinterpret_s16_f16(a)); } + + struct v_float16x4 + { diff --git a/var/spack/repos/builtin/packages/opencv/package.py b/var/spack/repos/builtin/packages/opencv/package.py index c589e7fdd2..52f59263b8 100644 --- a/var/spack/repos/builtin/packages/opencv/package.py +++ b/var/spack/repos/builtin/packages/opencv/package.py @@ -126,6 +126,7 @@ class Opencv(CMakePackage, CudaPackage): patch('opencv3.2_regacyvtk.patch', when='@3.2+vtk') patch('opencv3.2_ffmpeg.patch', when='@3.2+videoio') patch('opencv3.2_python3.7.patch', when='@3.2+python') + patch('opencv3.2_fj.patch', when='@3.2 %fj') depends_on('eigen', when='+eigen') depends_on('zlib', when='+zlib') |