deepcrayon/buildroot
deepcrayon/buildroot
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

package/opencv3: fix aarch64 build

Browse source 
Commit a17402e42d ("opencv3:
conditionally enable NEON and VFPv3 optimizations") broke the build on
AArch64, because the VFPv3 optimizations are not supported by OpenCV
on this architecture:

  https://github.com/opencv/opencv/blob/3.4/cmake/OpenCVCompilerOptimizations.cmake#L275

However BR2_ARM_CPU_HAS_VFPV3 is always true on AArch64, causing this
build failure for every AArch64 build of OpenCV 3. This commit fixes
that by enabling VFPV3 only on ARM, and not on AArch64.

Fixes:

  http://autobuild.buildroot.net/results/d38fb092cffe086f93b469d1181da77fba0994bd/

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Bernd Kuhls 2018-07-30 18:08:36 +02:00 committed by Thomas Petazzoni
parent 88a161b388
commit 141cf77903
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
package/opencv3/opencv3.mk
View file

@ -100,8 +100,13 @@ OPENCV3_CONF_OPTS += \
# adding '-mcpu=G3 -mtune=G5' to them, which is already handled by Buildroot.
OPENCV3_CONF_OPTS += \
-DENABLE_POWERPC=OFF \
-DENABLE_NEON=$(if $(BR2_ARM_CPU_HAS_NEON),ON,OFF) \
-DENABLE_VFPV3=$(if $(BR2_ARM_CPU_HAS_VFPV3),ON,OFF)
-DENABLE_NEON=$(if $(BR2_ARM_CPU_HAS_NEON),ON,OFF)
ifeq ($(BR2_ARCH_IS_64):$(BR2_ARM_CPU_HAS_VFPV3),:y)
OPENCV3_CONF_OPTS += -DENABLE_VFPV3=ON
else
OPENCV3_CONF_OPTS += -DENABLE_VFPV3=OFF
endif
# Cuda stuff
OPENCV3_CONF_OPTS += \