summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernd Kuhls <bernd.kuhls@t-online.de>2018-08-01 20:55:28 (GMT)
committerThomas Petazzoni <thomas.petazzoni@bootlin.com>2018-08-05 12:16:14 (GMT)
commit3b734042d9b65b4895b698cec73a0a565cfc3d54 (patch)
treed0a0b79574d1e7f927c1fa33ed79fcd1e2826f66
parent27797caf76b58aaa9ca0c4dc1044b328dbc6e829 (diff)
downloadbuildroot-3b734042d9b65b4895b698cec73a0a565cfc3d54.tar.gz
buildroot-3b734042d9b65b4895b698cec73a0a565cfc3d54.tar.bz2
package/opencv3: fix build with gcc bug 64735
OpenCV3 allows to disable the usage of std::exception_ptr: https://github.com/opencv/opencv/issues/11878#issuecomment-402099255 Fixes http://autobuild.buildroot.net/results/5ca/5ca221792c72c0a19f8b0e8303c0603d28f3c48e/ Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-rw-r--r--package/opencv3/opencv3.mk10
1 files changed, 9 insertions, 1 deletions
diff --git a/package/opencv3/opencv3.mk b/package/opencv3/opencv3.mk
index 09455d6..ea4d227 100644
--- a/package/opencv3/opencv3.mk
+++ b/package/opencv3/opencv3.mk
@@ -11,13 +11,21 @@ OPENCV3_LICENSE = BSD-3-Clause
OPENCV3_LICENSE_FILES = LICENSE
OPENCV3_SUPPORTS_IN_SOURCE_BUILD = NO
+OPENCV3_CXXFLAGS = $(TARGET_CXXFLAGS)
+
# Uses __atomic_fetch_add_4
ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
-OPENCV3_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -latomic"
+OPENCV3_CXXFLAGS += -latomic
+endif
+
+# Fix c++11 build with missing std::exception_ptr
+ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_64735),y)
+OPENCV3_CXXFLAGS += -DCV__EXCEPTION_PTR=0
endif
# OpenCV component options
OPENCV3_CONF_OPTS += \
+ -DCMAKE_CXX_FLAGS="$(OPENCV3_CXXFLAGS)" \
-DBUILD_DOCS=OFF \
-DBUILD_PERF_TESTS=$(if $(BR2_PACKAGE_OPENCV3_BUILD_PERF_TESTS),ON,OFF) \
-DBUILD_TESTS=$(if $(BR2_PACKAGE_OPENCV3_BUILD_TESTS),ON,OFF) \