@@ -1,14 +1,18 @@
comment "armadillo needs a toolchain w/ C++"
depends on !BR2_INSTALL_LIBSTDCPP
- depends on !(BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el) # clapack
- depends on !(BR2_powerpc && BR2_TOOLCHAIN_USES_UCLIBC) # clapack
- depends on !BR2_bfin # clapack
+ depends on !(BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el)
+ depends on !BR2_powerpc
+ depends on !BR2_bfin
+
+comment "armadillo needs an (e)glibc toolchain w/ C++"
+ depends on BR2_powerpc
+ depends on !BR2_INSTALL_LIBSTDCPP || BR2_TOOLCHAIN_USES_UCLIBC
config BR2_PACKAGE_ARMADILLO
bool "armadillo"
depends on BR2_INSTALL_LIBSTDCPP
depends on !(BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el) # clapack
- depends on !(BR2_powerpc && BR2_TOOLCHAIN_USES_UCLIBC) # clapack
+ depends on !BR2_powerpc || BR2_TOOLCHAIN_USES_GLIBC # clapack
depends on !BR2_bfin # clapack
select BR2_PACKAGE_CLAPACK
help
@@ -1,9 +1,13 @@
+comment "clapack needs an (e)glibc toolchain"
+ depends on BR2_powerpc
+ depends on !BR2_TOOLCHAIN_USES_GLIBC
+
config BR2_PACKAGE_CLAPACK
bool "cblas/clapack"
depends on !(BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el)
# _fpu_control is used on PowerPC, but not available with
- # uClibc
- depends on !(BR2_powerpc && BR2_TOOLCHAIN_USES_UCLIBC)
+ # uClibc or musl
+ depends on !BR2_powerpc || BR2_TOOLCHAIN_USES_GLIBC
# disable clapack on blackfin, it triggers "undefined symbol" failure
# because of the "_" symbol prefix:
# http://autobuild.buildroot.net/results/a28df0ba10803e6e54c2f8160bbd8190cba4d690/
Provide appropriate comments for the powerpc and !powerpc cases. Adapt armadillo's comments accordingly. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Samuel Martin <s.martin49@gmail.com> --- package/armadillo/Config.in | 12 ++++++++---- package/clapack/Config.in | 8 ++++++-- 2 files changed, 14 insertions(+), 6 deletions(-)