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

package/boost: boost needs wchar

Browse Source 
The most modules of boost needs a toolchain with wchar. To ease maintenance
we make the entire boost package depend on wchar.

Also add a reverse dependency to libftdipp1 and yaml-cpp.

Fixes:
http://autobuild.buildroot.net/results/49f/49f5c0521fc90fbd4673ad233ff679be007d2953/
http://autobuild.buildroot.net/results/12f/12f544c97e3451fb2a72025ebc62292957e47070/
http://autobuild.buildroot.net/results/ef6/ef6c897ea7547e8ed5f019e8ce4473f0998f2c16/
http://autobuild.buildroot.net/results/7a0/7a0ab069c505696a7887ba5c561b76b233ce59d5/

and more.

Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Jörg Krause 2015-07-24 10:14:53 +02:00 committed by Thomas Petazzoni
parent a95960e565
commit d86b94e028
3 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
package/boost/Config.in
View File

@ -1,5 +1,5 @@
comment "boost needs a toolchain w/ C++, threads" comment "boost needs a toolchain w/ C++, threads, wchar"
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR
config BR2_PACKAGE_BOOST_ARCH_SUPPORTS config BR2_PACKAGE_BOOST_ARCH_SUPPORTS
bool bool
@ -14,6 +14,7 @@ config BR2_PACKAGE_BOOST
# that unfortunately doesn't work. Until someone fixes that, # that unfortunately doesn't work. Until someone fixes that,
# let's depend on threads. # let's depend on threads.
depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_USE_WCHAR
help help
A general purpose C++ library A general purpose C++ library
@ -77,10 +78,6 @@ config BR2_PACKAGE_BOOST_EXCEPTION
config BR2_PACKAGE_BOOST_FILESYSTEM config BR2_PACKAGE_BOOST_FILESYSTEM
bool "boost-filesystem" bool "boost-filesystem"
depends on BR2_USE_WCHAR
comment "boost-filesystem needs a toolchain w/ wchar"
depends on !BR2_USE_WCHAR
config BR2_PACKAGE_BOOST_GRAPH config BR2_PACKAGE_BOOST_GRAPH
bool "boost-graph" bool "boost-graph"
@ -94,12 +91,8 @@ config BR2_PACKAGE_BOOST_IOSTREAMS
select BR2_PACKAGE_ZLIB select BR2_PACKAGE_ZLIB
config BR2_PACKAGE_BOOST_LOCALE config BR2_PACKAGE_BOOST_LOCALE
depends on BR2_USE_WCHAR
bool "boost-locale" bool "boost-locale"
comment "boost-locale needs a toolchain w/ wchar"
depends on !BR2_USE_WCHAR
config BR2_PACKAGE_BOOST_LOG config BR2_PACKAGE_BOOST_LOG
bool "boost-log" bool "boost-log"
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL

5
package/libftdi1/Config.in
View File

@ -15,11 +15,12 @@ config BR2_PACKAGE_LIBFTDI1_LIBFTDIPP1
depends on BR2_INSTALL_LIBSTDCPP # boost depends on BR2_INSTALL_LIBSTDCPP # boost
depends on BR2_TOOLCHAIN_HAS_THREADS # boost depends on BR2_TOOLCHAIN_HAS_THREADS # boost
depends on BR2_PACKAGE_BOOST_ARCH_SUPPORTS depends on BR2_PACKAGE_BOOST_ARCH_SUPPORTS
depends on BR2_USE_WCHAR # boost
help help
C++ bindings for libftdi C++ bindings for libftdi
comment "libftdipp1 needs a toolchain w/ C++" comment "libftdipp1 needs a toolchain w/ C++, wchar"
depends on !BR2_INSTALL_LIBSTDCPP depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR
depends on BR2_PACKAGE_BOOST_ARCH_SUPPORTS depends on BR2_PACKAGE_BOOST_ARCH_SUPPORTS
config BR2_PACKAGE_LIBFTDI1_PYTHON_BINDINGS config BR2_PACKAGE_LIBFTDI1_PYTHON_BINDINGS

5
package/yaml-cpp/Config.in
View File

@ -3,6 +3,7 @@ config BR2_PACKAGE_YAML_CPP
depends on BR2_INSTALL_LIBSTDCPP depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_TOOLCHAIN_HAS_THREADS # boost depends on BR2_TOOLCHAIN_HAS_THREADS # boost
depends on BR2_PACKAGE_BOOST_ARCH_SUPPORTS depends on BR2_PACKAGE_BOOST_ARCH_SUPPORTS
depends on BR2_USE_WCHAR # boost
select BR2_PACKAGE_BOOST select BR2_PACKAGE_BOOST
help help
yaml-cpp is a YAML parser and emitter in C++ matching yaml-cpp is a YAML parser and emitter in C++ matching
@ -10,6 +11,6 @@ config BR2_PACKAGE_YAML_CPP
https://code.google.com/p/yaml-cpp/ https://code.google.com/p/yaml-cpp/
comment "yaml-cpp needs a toolchain w/ C++, threads" comment "yaml-cpp needs a toolchain w/ C++, threads, wchar"
depends on BR2_PACKAGE_BOOST_ARCH_SUPPORTS depends on BR2_PACKAGE_BOOST_ARCH_SUPPORTS
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR