mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-08-08 08:30:47 -09:00
Code Issues Packages Projects Releases Wiki Activity

Config.in files: add missing dependencies to toolchain option comments

Browse Source 
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>
This commit is contained in:
Thomas De Schampheleire
2013-11-07 09:24:37 +01:00
committed by Peter Korsgaard
parent 3c33c11386
commit be084204eb
162 changed files with 228 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
package/sqlcipher/Config.in
View File

@@ -10,9 +10,10 @@ config BR2_PACKAGE_SQLCIPHER
http://sqlcipher.net
if BR2_PACKAGE_SQLCIPHER
config BR2_PACKAGE_SQLCIPHER_READLINE
bool "Command-line editing"
depends on BR2_PACKAGE_SQLCIPHER
select BR2_PACKAGE_NCURSES
select BR2_PACKAGE_READLINE
help
@@ -20,14 +21,16 @@ config BR2_PACKAGE_SQLCIPHER_READLINE
config BR2_PACKAGE_SQLCIPHER_STAT3
bool "Additional query optimizations (stat3)"
depends on BR2_PACKAGE_SQLCIPHER
help
Adds additional logic to the ANALYZE command and to the query
planner that can help SQLite to choose a better query plan under
certain situations.
endif
comment "sqlcipher conflicts with sqlite"
depends on BR2_PACKAGE_SQLITE
comment "sqlcipher needs a toolchain w/ threads"
depends on !BR2_PACKAGE_SQLITE
depends on !BR2_TOOLCHAIN_HAS_THREADS