summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2010-01-18 15:14:18 +0100
committerPeter Korsgaard <jacmet@sunsite.dk>2010-01-18 15:14:18 +0100
commit1653a281b99d12a4bf69cebb73394edab9485b01 (patch)
treefdfa2045c562007898d21bf7d7ed25088129e4c9
parentecf5939cfb394289cb275134e2929b5d9076628d (diff)
rpm: needs XML support in libneon
RPM-5.2.0 needs the optional XML support in libneon. Restructure kconfig dependencies to ensure rpm can only be selected if libneon with XML support (in addition to SSL + ZLIB) is enabled. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/rpm/Config.in8
1 files changed, 5 insertions, 3 deletions
diff --git a/package/rpm/Config.in b/package/rpm/Config.in
index e6e8769c0..448606c33 100644
--- a/package/rpm/Config.in
+++ b/package/rpm/Config.in
@@ -1,12 +1,14 @@
+comment "rpm requires libneon with SSL, XML and ZLIB support"
+ depends on !BR2_PACKAGE_NEON || BR2_PACKAGE_NEON_NOXML
+
config BR2_PACKAGE_RPM
bool "rpm"
select BR2_PACKAGE_BEECRYPT
select BR2_PACKAGE_POPT
select BR2_PACKAGE_OPENSSL
- select BR2_PACKAGE_NEON
+ depends on BR2_PACKAGE_NEON
+ depends on !BR2_PACKAGE_NEON_NOXML
select BR2_PACKAGE_NEON_ZLIB
- select BR2_PACKAGE_NEON_EXPAT if BR2_PACKAGE_EXPAT
- select BR2_PACKAGE_NEON_LIBXML2 if BR2_PACKAGE_LIBXML2
select BR2_PACKAGE_NEON_SSL
help
The RPM package management system.