]> rtime.felk.cvut.cz Git - coffee/buildroot.git/commitdiff
libftdi: C++ bindings need boost
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Sun, 24 Jan 2016 23:07:47 +0000 (00:07 +0100)
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tue, 26 Jan 2016 20:25:22 +0000 (21:25 +0100)
According to libftdi configure.in:

"""
dnl libftdi C++ wrapper. Needs boost.
[...]
        if test "x$HAVE_BOOST" != "xyes"; then
            AC_MSG_ERROR(Sorry, we need the boost library for the C++ wrapper)
        fi
"""

And indeed, if you enable BR2_PACKAGE_LIBTFDI_CPP but don't have Boost
enabled, the libfdipp library is not built. To fix this, this commit
changes BR2_PACKAGE_LIBTFDI_CPP to select Boost.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
package/libftdi/Config.in
package/libftdi/libftdi.mk

index 76b30b1ba1a450bdf28545750b5686f1c76329a8..c0ab0f25ac7f3978b510f2a759a644672f2c3b1c 100644 (file)
@@ -12,11 +12,18 @@ config BR2_PACKAGE_LIBFTDI
 if BR2_PACKAGE_LIBFTDI
 
 config BR2_PACKAGE_LIBTFDI_CPP
-       depends on BR2_INSTALL_LIBSTDCPP
        bool "C++ bindings"
+       depends on BR2_INSTALL_LIBSTDCPP
+       depends on BR2_PACKAGE_BOOST_ARCH_SUPPORTS
+       depends on BR2_USE_WCHAR
+       select BR2_PACKAGE_BOOST
        help
          C++ bindings for libftdi
 
+comment "libftdi C++ bindings need a toolchain w/ wchar, C++"
+       depends on BR2_PACKAGE_BOOST_ARCH_SUPPORTS
+       depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP
+
 endif # BR2_PACKAGE_LIBFTDI
 
 comment "libftdi needs a toolchain w/ threads"
index 8370b0a160433a8ea53e5e48ef2800ceaf73fa94..28f20e354731f5caf69c1ef0a8ba6fd089c245ba 100644 (file)
@@ -15,6 +15,7 @@ LIBFDTI_CONF_OPTS = --without-examples
 
 # configure detect it automaticaly so we need to force it
 ifeq ($(BR2_PACKAGE_LIBTFDI_CPP),y)
+LIBFTDI_DEPENDENCIES += boost
 LIBFDTI_CONF_OPTS += --enable-libftdipp
 else
 LIBFDTI_CONF_OPTS += --disable-libftdipp