Subversion package and related patches

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.

The rpm package is updated accordingly.

Signed-off-by Thomas Petazzoni <[email protected]>

---
  package/neon/Config.in | 27 +++++++--------------------
  package/rpm/Config.in  |  7 ++-----
  2 files changed, 9 insertions(+), 25 deletions(-)

package/neon/Config.in +0 -9

index f972dbb..3f18665 100644
@@ -19,30 +19,17 @@ config BR2_PACKAGE_NEON_SSL
  	help
  	  build with SSL support
 
-choice
-	prompt "XML Support"
-	depends on BR2_PACKAGE_NEON
-	help
-	  Select which XML library to use...
-	  none       do not build with XML support
-	  expat      use expat
-	  libxml2    use libxml2
-

package/neon/Config.in +5 -5

+	depends on !BR2_PACKAGE_NEON_LIBXML2
  	help
-	  expat      use expat, a library for parsing XML.
+	  Enable XML support in neon, using the Expat XML library.
 
  config BR2_PACKAGE_NEON_LIBXML2
-	bool "libxml2"
+	bool "XML support with libxml2"
  	select BR2_PACKAGE_LIBXML2
+	depends on BR2_PACKAGE_NEON
  	help
-	  libxml2    use libxml2, a library to read, modify and
-	             write XML and HTML files.
-endchoice
+	  Enable XML support in neon, using the libxml2 XML library.

package/rpm/Config.in +0 -3

index 14072c9..8faca95 100644
@@ -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
-

package/rpm/Config.in +0 -0

  	select BR2_PACKAGE_NEON_ZLIB
  	select BR2_PACKAGE_NEON_SSL
  	help

package/neon/Config.in config BR2_PACKAGE_NEON_SSL · line 25

Quoted 5 lines

config BR2_PACKAGE_NEON_EXPAT

package/neon/Config.in +2 -1

-	bool "expat"
+	bool "XML support with expat"
  	select BR2_PACKAGE_EXPAT
+	depends on BR2_PACKAGE_NEON

Can you use "if ... endif" instead of depends on?

package/rpm/Config.in line 11

Quoted 10 lines

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

package/rpm/Config.in +2 -2

-	depends on BR2_PACKAGE_NEON
-	depends on !BR2_PACKAGE_NEON_NOXML
+	select BR2_PACKAGE_NEON
+	select BR2_PACKAGE_NEON_EXPAT if !BR2_PACKAGE_NEON_LIBXML2

Maybe it's cleaner to add a hidden symbol to neon:

config BR2_PACKAGE_NEON_XML
bool
select BR2_PACKAGE_NEON_EXPAT if !BR2_PACKAGE_NEON_LIBXML2

Then in rpm, you only need to select BR2_PACKAGE_NEON_XML

-----Urspr?ngliche Nachricht-----
Von: Thomas Petazzoni [mailto:thomas.petazzoni at free-electrons.com]
Gesendet: Samstag, 24. August 2013 13:08
An: Buildroot List
Cc: Rico Bachmann
Betreff: [PATCH 0/3] Subversion package and related patches

Hello,

Here are three patches that add a package for Subversion. I don't need it myself, but it was a submission from Rico Bachmann that had been waiting since quite some time in our patchwork. I took it, tested it and made a few improvements. Some changes in the neon package were needed to make it work properly.

Thanks,

Thomas

Rico Bachmann (1):
subversion: new package

Thomas Petazzoni (2):
neon: replace 'choice' for XML library with two options
neon: factorize 'depends on BR2_PACKAGE_NEON'

 package/Config.in                |  1 +
 package/neon/Config.in           | 31 +++++++++----------------------
 package/rpm/Config.in            |  7 ++-----
 package/subversion/Config.in     | 11 +++++++++++
 package/subversion/subversion.mk | 28 ++++++++++++++++++++++++++++
 5 files changed, 51 insertions(+), 27 deletions(-)  create mode 100644

package/subversion/Config.in create mode 100644
package/subversion/subversion.mk

--
1.8.1.2