| Message ID | 20230326074820.12583-1-ps.report@gmx.net |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v1] package/flann: needs C++11 support | expand |
Peter, All, On 2023-03-26 09:48 +0200, Peter Seiderer spake thusly: > Fixes: > > - http://autobuild.buildroot.net/results/c92a3df1bc73e00e1e4493500bfb7277cf5064ee > > .../build/flann-1.9.2/src/cpp/flann/util/lsh_table.h:367:5: error: 'random_device' is not a member of 'std' > std::random_device rd; > ^ > > Signed-off-by: Peter Seiderer <ps.report@gmx.net> Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/flann/Config.in | 6 ++++-- > package/flann/flann.mk | 2 +- > 2 files changed, 5 insertions(+), 3 deletions(-) > > diff --git a/package/flann/Config.in b/package/flann/Config.in > index 180d7eae8a..8b32e9077c 100644 > --- a/package/flann/Config.in > +++ b/package/flann/Config.in > @@ -2,6 +2,7 @@ config BR2_PACKAGE_FLANN > bool "flann" > depends on BR2_INSTALL_LIBSTDCPP > depends on !BR2_STATIC_LIBS > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11 > select BR2_PACKAGE_LZ4 > help > FLANN is a library for performing fast approximate nearest > @@ -22,5 +23,6 @@ config BR2_PACKAGE_FLANN_EXAMPLES > > endif > > -comment "flann needs a toolchain w/ C++, dynamic library" > - depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS > +comment "flann needs a toolchain w/ C++, dynamic library, gcc >= 4.7" > + depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \ > + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 > diff --git a/package/flann/flann.mk b/package/flann/flann.mk > index d1a622e685..dc75b977af 100644 > --- a/package/flann/flann.mk > +++ b/package/flann/flann.mk > @@ -18,7 +18,7 @@ FLANN_CONF_OPTS = \ > -DUSE_OPENMP=$(if $(BR2_TOOLCHAIN_HAS_OPENMP),ON,OFF) \ > -DCMAKE_DISABLE_FIND_PACKAGE_HDF5=TRUE > > -FLANN_CXXFLAGS = $(TARGET_CXXFLAGS) > +FLANN_CXXFLAGS = $(TARGET_CXXFLAGS) -std=c++11 > > ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_68485),y) > FLANN_CXXFLAGS += -O0 > -- > 2.39.2 > > _______________________________________________ > buildroot mailing list > buildroot@buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot
>>>>> "Peter" == Peter Seiderer <ps.report@gmx.net> writes: > Fixes: > - http://autobuild.buildroot.net/results/c92a3df1bc73e00e1e4493500bfb7277cf5064ee > .../build/flann-1.9.2/src/cpp/flann/util/lsh_table.h:367:5: error: 'random_device' is not a member of 'std' > std::random_device rd; > ^ > Signed-off-by: Peter Seiderer <ps.report@gmx.net> A quick grep shows that this was only introduced in flann 1.9.2, so committed to 2023.02.x but not to 2022.02.x, thanks.
diff --git a/package/flann/Config.in b/package/flann/Config.in index 180d7eae8a..8b32e9077c 100644 --- a/package/flann/Config.in +++ b/package/flann/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_FLANN bool "flann" depends on BR2_INSTALL_LIBSTDCPP depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11 select BR2_PACKAGE_LZ4 help FLANN is a library for performing fast approximate nearest @@ -22,5 +23,6 @@ config BR2_PACKAGE_FLANN_EXAMPLES endif -comment "flann needs a toolchain w/ C++, dynamic library" - depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS +comment "flann needs a toolchain w/ C++, dynamic library, gcc >= 4.7" + depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 diff --git a/package/flann/flann.mk b/package/flann/flann.mk index d1a622e685..dc75b977af 100644 --- a/package/flann/flann.mk +++ b/package/flann/flann.mk @@ -18,7 +18,7 @@ FLANN_CONF_OPTS = \ -DUSE_OPENMP=$(if $(BR2_TOOLCHAIN_HAS_OPENMP),ON,OFF) \ -DCMAKE_DISABLE_FIND_PACKAGE_HDF5=TRUE -FLANN_CXXFLAGS = $(TARGET_CXXFLAGS) +FLANN_CXXFLAGS = $(TARGET_CXXFLAGS) -std=c++11 ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_68485),y) FLANN_CXXFLAGS += -O0
Fixes: - http://autobuild.buildroot.net/results/c92a3df1bc73e00e1e4493500bfb7277cf5064ee .../build/flann-1.9.2/src/cpp/flann/util/lsh_table.h:367:5: error: 'random_device' is not a member of 'std' std::random_device rd; ^ Signed-off-by: Peter Seiderer <ps.report@gmx.net> --- package/flann/Config.in | 6 ++++-- package/flann/flann.mk | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-)