Commit Graph

45 Commits

Author SHA1 Message Date
Thomas De Schampheleire
aaffd209fa packages: rename FOO_CONF_OPT into FOO_CONF_OPTS
To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS,
make the same change for FOO_CONF_OPT.

Sed command used:
   find * -type f | xargs sed -i 's#_CONF_OPT\>#&S#g'

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-10-04 18:54:16 +02:00
Jerzy Grzegorek
c7f4b96471 package: remove the trailing slash sign from <PKG>_SITE variable
Since the trailing slash is stripped from $($(PKG)_SITE) by pkg-generic.mk:

$(call DOWNLOAD,$($(PKG)_SITE:/=)/$($(PKG)_SOURCE))

so it is redundant.
This patch removes it from $(PKG)_SITE variable for BR consistency.

Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-07-31 23:17:46 +02:00
Axel Lin
1952897ba6 neon: bump to version 0.30.0
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-10-05 21:11:51 +02:00
Thomas Petazzoni
7573464a98 neon: disable webdav when no XML support is available
Since 9169810a9b ("neon: replace
'choice' for XML library with two options") the option
BR2_PACKAGE_NEON_NOXML no longer exists. However, it was not taken
into account properly within neon.mk, as this option was still used to
disable webdav support when no XML library has been selected.

Fixes:

  http://autobuild.buildroot.org/results/7ed/7ed657570d83b28389dd8c01ffdd895d2e8d145f/

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-09-01 21:35:47 +02:00
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
Alexandre Belloni
8dfd59d114 Normalize separator size to 80
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-06-06 22:30:24 +02:00
Alexandre Belloni
702704014d Fix package headers to comply with coding style
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-06-06 17:26:35 +02:00
Peter Korsgaard
f8a6a1b94a neon: fix license files
GPL license is under test/, not src/.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-05-14 17:18:18 +02:00
Thomas Petazzoni
ff0865a946 neon: add license informations
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-03-24 20:36:02 +01:00
Thomas Petazzoni
a5ce857674 package: use <pkg>_CONFIG_SCRIPTS wherever possible
Use the <pkg>_CONFIG_SCRIPTS mechanism in all packages for which it
does all what the package was doing. A few packages, like libxslt, are
for now left out, since they need some additional fixup (for example a
fixup of includedir).

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-02-08 22:34:26 +01:00
Stefan Fröberg
0db5e1203d neon: fix neon-config
[Peter: use a single sed invocation]
Signed-off-by: Stefan Fröberg <stefan.froberg@petroprogram.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-01-04 22:45:57 +01:00
Gustavo Zacarias
019a581f89 packages: switch to host-pkgconf
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-10-29 22:02:55 +01:00
Arnout Vandecappelle (Essensium/Mind)
e1502ebc0c all packages: rename XXXTARGETS to xxx-package
Also remove the redundant $(call ...).

This is a purely mechanical change, performed with
find package linux toolchain boot -name \*.mk | \
  xargs sed -i -e 's/$(eval $(call GENTARGETS))/$(eval $(generic-package))/' \
               -e 's/$(eval $(call AUTOTARGETS))/$(eval $(autotools-package))/' \
               -e 's/$(eval $(call CMAKETARGETS))/$(eval $(cmake-package))/'

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2012-07-17 20:23:05 +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
760d4afd44 neon: additional white space fix
Missed from 66e09abc57 (neon: cleanup).

Thanks to Michael S. Zick for noticing.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-10-11 13:52:10 +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
66e09abc57 neon: cleanup
Whitespace fixes / removal of redundant lines. No functional change.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-10-11 09:27:25 +02:00
Peter Korsgaard
8ece8e2775 neon: bump version
Closes #4321

Old neon version wasn't compatible with our openssl version, so bump
the version. This also fixes some security related bugs.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-10-11 09:11:21 +02:00
Thomas Petazzoni
300f9c9c9d package: remove useless arguments from AUTOTARGETS
Thanks to the pkgparentdir and pkgname functions, we can rewrite the
AUTOTARGETS macro in a way that avoids the need for each package to
repeat its name and the directory in which it is present.

[Peter: pkgdir->pkgparentdir]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-09-29 23:12:27 +02:00
Thomas Petazzoni
0a5e5534cb packages: remove --{enable,disable}-{shared,static} from autotools packages
Now that those values are passed at the autotools infrastructure
level, there's no need for every package to pass inconsistent values.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-06-12 21:59:59 +02:00
Thomas Petazzoni
7ec08dab28 neon: remove neon-config script from TARGET_DIR
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2011-03-07 22:22:31 +01:00
Thomas Petazzoni
478ea1a12d packages: remove unneeded _INSTALL_TARGET_OPT definitions
Now that <pkg>_INSTALL_TARGET_OPT always defaults to
'DESTDIR=$(TARGET_DIR) install', we can remove the
<pkg>_INSTALL_TARGET_OPT definition from a lot of packages.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-09-27 15:32:32 +02:00
Thomas Petazzoni
ccc6ef6c17 neon: remove useless stripping
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-09-12 19:26:53 +02:00
Thomas Petazzoni
4a2dabe9d5 neon: explicit path to xml2-config
Now that $(STAGING_DIR)/usr/bin is not in the PATH, we need to
explicit the path to such tools.

This might also fix bug 1393 since by expliciting the path to
xml2-config, we'll force neon ./configure to choose our xml2-config
and not the one of the host.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-07-18 22:49:12 +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
Thomas Petazzoni
6dc336b293 host-pkgconfig is now host-pkg-config
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-12-15 19:57:31 +01:00
Nigel Kukard
9f96221e5e Build neon with SSL support if available 2009-08-05 12:11:08 +00:00
Will Newton
1029ec82df neon: Fix pkgconfig dependency
neon should depend on host-pkgconfig rather than pkgconfig.

Closes #385.

Signed-off-by: Will Newton <will.newton@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2009-06-11 21:42:12 +02: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
ac1d92c425 package/: get rid of unneeded $(strip ..) 2008-12-08 08:15:27 +00:00
Peter Korsgaard
fc7bf9e325 neon: don't strip if BR2_ENABLE_DEBUG is enabled 2008-10-20 11:53:08 +00:00
Peter Korsgaard
909410f686 neon: use := assignments 2008-08-26 20:47:23 +00:00
Peter Korsgaard
fa62c2bb19 neon: uses pkgconfig so select it 2008-08-26 20:47:19 +00:00
Peter Korsgaard
2cd9ff92d7 neon: strip target library
neon doesn't have an install-strip target, so do it afterwards instead.
2008-08-26 20:47:15 +00:00
Peter Korsgaard
95313e2000 neon: fix compilation without xml support
webdav needs xml support, so disable it if no xml support is selected,
otherwise configure could get confused about a host xml2-config script.
2008-08-26 20:47:12 +00:00
Peter Korsgaard
3e1ed2feb0 neon: bump version
Fixes CVE-2008-3746.
2008-08-26 20:47:09 +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