be084204eb
When a package A depends on config option B and toolchain option C, then the comment that is given when C is not fulfilled should also depend on B. For example: config BR2_PACKAGE_A depends on BR2_B depends on BR2_LARGEFILE depends on BR2_WCHAR comment "A needs a toolchain w/ largefile, wchar" depends on !BR2_LARGEFILE || !BR2_WCHAR This comment should actually be: comment "A needs a toolchain w/ largefile, wchar" depends on BR2_B depends on !BR2_LARGEFILE || !BR2_WCHAR or if possible (typically when B is a package config option declared in that same Config.in file): if BR2_B comment "A needs a toolchain w/ largefile, wchar" depends on !BR2_LARGEFILE || !BR2_WCHAR [other config options depending on B] endif Otherwise, the comment would be visible even though the other dependencies are not met. This patch adds such missing dependencies, and changes existing such dependencies from depends on BR2_BASE_DEP && !BR2_TOOLCHAIN_USES_GLIBC to depends on BR2_BASE_DEP depends on !BR2_TOOLCHAIN_USES_GLIBC so that (positive) base dependencies are separate from the (negative) toolchain dependencies. This strategy makes it easier to write such comments (because one can simply copy the base dependency from the actual package config option), but also avoids complex and long boolean expressions. Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> (untested) Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
23 lines
951 B
Plaintext
23 lines
951 B
Plaintext
config BR2_PACKAGE_MIDORI
|
|
bool "midori"
|
|
select BR2_PACKAGE_WEBKIT
|
|
select BR2_PACKAGE_LIBSEXY
|
|
select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
|
|
select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
|
|
depends on BR2_PACKAGE_LIBGTK2
|
|
depends on BR2_INSTALL_LIBSTDCPP # webkit
|
|
depends on BR2_TOOLCHAIN_HAS_THREADS # webkit -> enchant -> libglib2
|
|
depends on BR2_USE_WCHAR # webkit
|
|
depends on (BR2_arm || BR2_armeb || BR2_i386 || BR2_mips || BR2_mipsel || \
|
|
BR2_powerpc || BR2_sh || BR2_sparc || BR2_x86_64) # webkit
|
|
help
|
|
Midori is a lightweight web browser based on WebKit
|
|
|
|
http://software.twotoasts.de/?page=midori
|
|
|
|
comment "midori needs libgtk2 and a toolchain w/ C++, wchar, threads"
|
|
depends on (BR2_arm || BR2_armeb || BR2_i386 || BR2_mips || BR2_mipsel || \
|
|
BR2_powerpc || BR2_sh || BR2_sparc || BR2_x86_64)
|
|
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
|
|
!BR2_TOOLCHAIN_HAS_THREADS || !BR2_PACKAGE_LIBGTK2
|