diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2013-08-27 19:08:04 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2013-08-28 00:23:49 +0200 |
| commit | 9169810a9bd97c99d8b7a0e8aadabdcca3883e99 (patch) | |
| tree | f5a34dafbc3dcb26479549b413b468df42cf9e13 /package/rpm | |
| parent | f6d97131220bc3bc4b604af4ee8a79fc7e8cab73 (diff) | |
neon: replace 'choice' for XML library with two options
The NEON library can either be compiled without XML support, with XML
support provided by Expat, or with XML support provided by
libxml2. Until now, to represent this, a Kconfig 'choice..endchoice'
was used. Unfortunately, another package cannot 'select' one of the
possible choices. So for example, a package such as 'rpm', or the
to-be-added 'subversion' package could not select their dependencies,
they had to do a 'depends on !BR2_PACKAGE_NEON_NOXML', which is not
how Buildroot handles library dependencies in general.
So, this commit replaces the 'choice...endchoice' block with simply
two configuration options that are mutually exclusive. The option
names are not changed, so no Config.in.legacy addition is needed.
An hidden option BR2_PACKAGE_NEON_XML is provided, so that packages
that need XML support in NEON but don't care whether it's provided by
Expat or libxml2 can simply select BR2_PACKAGE_NEON_XML.
The rpm package is updated accordingly.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/rpm')
| -rw-r--r-- | package/rpm/Config.in | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/package/rpm/Config.in b/package/rpm/Config.in index 14072c95f..63e536772 100644 --- a/package/rpm/Config.in +++ b/package/rpm/Config.in @@ -1,17 +1,14 @@ comment "rpm requires a toolchain with thread support" depends on !BR2_TOOLCHAIN_HAS_THREADS -comment "rpm requires libneon with SSL, XML and ZLIB support" - depends on !BR2_PACKAGE_NEON || BR2_PACKAGE_NEON_NOXML && BR2_TOOLCHAIN_HAS_THREADS - config BR2_PACKAGE_RPM bool "rpm" depends on BR2_TOOLCHAIN_HAS_THREADS # beecrypt select BR2_PACKAGE_BEECRYPT select BR2_PACKAGE_POPT select BR2_PACKAGE_OPENSSL - depends on BR2_PACKAGE_NEON - depends on !BR2_PACKAGE_NEON_NOXML + select BR2_PACKAGE_NEON + select BR2_PACKAGE_NEON_XML select BR2_PACKAGE_NEON_ZLIB select BR2_PACKAGE_NEON_SSL help |