NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/flann: re-enable package on microblaze

Browse Source 
With Microblaze gcc version <= 9.x, the build of flannel fails due to
gcc bug 68485: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68485.

To avoid this, the flann package has a !BR2_microblaze
dependency. However, gcc bug 68485 only triggers when optimization is
enabled, so we can work around the issue by passing -O0, which is what
we do in other Buildroot packages to work around this bug.

So, this commit passes -O0 when BR2_TOOLCHAIN_HAS_GCC_BUG_68485, and
re-enables flann on Microblaze.

Note that the comment was talking about gcc bug 69401, but this gcc
bug is a duplicate of 68485. Since all Buildroot packages now use the
reference to gcc bug 68485 and the option is named
BR2_TOOLCHAIN_HAS_GCC_BUG_68485, we use this naming as well for flann.

Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Giulio Benetti 2019-06-14 23:03:34 +02:00 committed by Thomas Petazzoni
parent 74e56b104f
commit 467552234d
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/flann/Config.in
View File

@ -2,9 +2,6 @@ config BR2_PACKAGE_FLANN
bool "flann"
depends on BR2_INSTALL_LIBSTDCPP
depends on !BR2_STATIC_LIBS
# all gcc versions fail to build flann on Microblaze due to
# gcc bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69401
depends on !BR2_microblaze
help
FLANN is a library for performing fast approximate nearest
neighbor searches in high dimensional spaces. It contains a
@ -25,5 +22,4 @@ config BR2_PACKAGE_FLANN_EXAMPLES
endif
comment "flann needs a toolchain w/ C++, dynamic library"
depends on !BR2_microblaze
depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS

8
package/flann/flann.mk
View File

@ -18,4 +18,12 @@ FLANN_CONF_OPTS = \
-DPYTHON_EXECUTABLE=OFF \
-DCMAKE_DISABLE_FIND_PACKAGE_HDF5=TRUE
FLANN_CXXFLAGS = $(TARGET_CXXFLAGS)
ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_68485),y)
FLANN_CXXFLAGS += -O0
endif
FLANN_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(FLANN_CXXFLAGS)"
$(eval $(cmake-package))