Commit Graph

15 Commits

Author SHA1 Message Date
Thomas Petazzoni
9169810a9b 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>
2013-08-28 00:23:49 +02:00
Thomas Petazzoni
f6d9713122 neon: factorize 'depends on BR2_PACKAGE_NEON'
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-08-28 00:23:37 +02:00
Arnout Vandecappelle (Essensium/Mind)
5ffe4283f7 neon: fix help text for BR2_PACKAGE_NEON_NOXML
Commit 4fbff28b removed the 'depends on' statements for the XML choice.
Therefore, the expat and libxml2 options are always available.  Remove
the cryptic part of help text that tells you to select something if it
is not available.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-04-19 15:48:02 +02:00
Peter Korsgaard
4fbff28b99 neon: use select rather than 'depends on' for xml dependencies
Similar to how we recently changed dbus. At the same time also reorder
options to put 'none' option in front (default).

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-04-04 21:55:04 +02:00
Peter Korsgaard
da653dd4ea neon: default to xml support if dependencies are available
Use expat support if expat package is enabled, libxml2 if enabled and
otherwise noxml.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-10-11 09:55:31 +02:00
Peter Korsgaard
b21c77cc08 neon: fix ssl option dependency
Thanks to Gustavo Zacarias for noticing.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2009-12-23 13:40:56 +01:00
Peter Korsgaard
2f3c46561e neon: add optional ssl support
Signed-off-by: Nigel Kukard <nkukard@lbsd.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2009-12-20 23:49:45 +01:00
Peter Korsgaard
77754571b2 pkgconfig: add pkgconfig package for target
The host versions shouldn't be visible in Kconfig, so remove the
reference to BR2_PACKAGE_PKGCONFIG everywhere and prefix the host targets
with host-.

At the same time add pkgconfig for the target (E.G. for development) and
let BR2_PACKAGE_PKGCONFIG control that package.

Notice: all defconfigs in the tree have been updated, but make sure to
disable the pkgconfig package (unless you want it) if you use an external
config, otherwise you'll end up with pkgconfig and glib2 in the target.
2009-03-18 19:19:10 +00:00
Peter Korsgaard
fd5ce9ff41 neon: s/exapt/expat/ 2009-01-08 08:27:45 +00:00
Nigel Kukard
cc6562ff83 * Refined building of neon options
- Added support to build with or without zlib support
2008-12-31 18:22:43 +00:00
Peter Korsgaard
fa62c2bb19 neon: uses pkgconfig so select it 2008-08-26 20:47:19 +00:00
Peter Korsgaard
02a623ddf9 buildroot: remove trailing spaces
for i in `find -name 'Config*' -o -name 'Makefile*' -o -name '*.mk'`;
do
	sed -i 's/ \+$//' $i;
done
2008-08-04 19:07:05 +00:00
Peter Korsgaard
4683420c4c Kconfig: remove 'default n'
'default n' is the default, so there's no need to say it explicitly.
2008-07-17 20:01:44 +00:00
Peter Korsgaard
a5ac61715b buildroot: s/depends/depends on/
The new kconfig is more strict regarding depends/depends on, so fixup
the tree.
2008-06-19 19:06:25 +00:00
Nigel Kukard
59a9c02e13 * Added neon 2008-04-12 09:56:15 +00:00