mirrors/buildroot
0
0
Fork 0
mirror of https://git.busybox.net/buildroot.git synced 2024-11-27 07:23:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

package/glog: needs gcc >= 6

Browse Source 
C++14 is mandatory since bump to version 0.7.0 in commit
2e9f161d4a and
6742834201
and
42a185cd88
resulting in the following build failure with gcc 5:

In file included from /home/buildroot/autobuild/run/instance-2/output-1/build/glog-0.7.0/src/demangle.cc:43:0:
/home/buildroot/autobuild/run/instance-2/output-1/build/glog-0.7.0/src/utilities.h:210:22: error: enclosing class of constexpr non-static member function 'google::glog_internal_namespace_::FileDescriptor::operator bool() const' is not a literal type
   constexpr explicit operator bool() const noexcept {
                      ^

Fixes: 2e9f161d4a
 - http://autobuild.buildroot.org/results/8d5e105283ead1057545b46726385f4ba4dff29e

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Fabrice Fontaine 2024-04-11 19:38:55 +02:00 committed by Thomas Petazzoni
parent 826e0bc336
commit 0bdce80231
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package/glog/Config.in
View File

@ -2,11 +2,13 @@ config BR2_PACKAGE_GLOG
bool "glog"
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_6 # C++14
help
C++ implementation of the Google logging module
https://github.com/google/glog
comment "glog needs a toolchain w/ C++, threads"
comment "glog needs a toolchain w/ C++, threads, gcc >= 6"
depends on !BR2_INSTALL_LIBSTDCPP || \
!BR2_TOOLCHAIN_HAS_THREADS
!BR2_TOOLCHAIN_HAS_THREADS || \
!BR2_TOOLCHAIN_GCC_AT_LEAST_6

4
package/opencv4-contrib/Config.in
View File

@ -251,6 +251,7 @@ config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_SALIENCY
config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_SFM
bool "sfm"
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_6 # glog
select BR2_PACKAGE_OPENCV4_LIB_IMGPROC
select BR2_PACKAGE_OPENCV4_LIB_IMGCODECS
select BR2_PACKAGE_EIGEN
@ -261,6 +262,9 @@ config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_SFM
to perform 3d reconstruction from 2d images. The core of
the module is a light version of Libmv.
comment "sfm needs a toolchain w/ gcc >= 6"
depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_6
config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_SHAPE
bool "shape"
help