Commit Graph

16 Commits

Author SHA1 Message Date
Peter Korsgaard
39b926d968 matchbox-keyboard: fix dependencies
Correct a number of issues with matchbox-keyboard:
 - Missing dependencies on host-pkgconf and expat
 - Missing kconfig select on xlib_libXft
 - pango/cairo confusion, ensure cairo is built before if enabled
 - _CONF_OPT variable typo

Fixes:
http://autobuild.buildroot.net/results/473/47380d57e507ec395a1132dfd7b32d35459c1c7a//
http://autobuild.buildroot.net/results/d9a/d9aa2b6ddce920ea45fbd7093addfc0ee6b94467//
http://autobuild.buildroot.net/results/aad/aad393a81812df28cbc296f556de2acb4e6d114b//
http://autobuild.buildroot.net/results/124/124b28336ed61822fa6d5d2591b4e70d83b8a213//
and 17 other build errors, dating back to 2013-07-03

Reported-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-05-20 23:43:58 +02:00
Thomas De Schampheleire
35eaed8d07 Config.in files: use if/endif instead of 'depends on' for main symbol
In the Config.in file of package foo, it often happens that there are other
symbols besides BR2_PACKAGE_FOO. Typically, these symbols only make sense
when foo itself is enabled. There are two ways to express this: with
    depends on BR2_PACKAGE_FOO
in each extra symbol, or with
    if BR2_PACKAGE_FOO
        ...
    endif
around the entire set of extra symbols.

The if/endif approach avoids the repetition of 'depends on' statements on
multiple symbols, so this is clearly preferred. But even when there is only
one extra symbol, if/endif is a more logical choice:
- it is future-proof for when extra symbols are added
- it allows to have just one strategy instead of two (less confusion)

This patch modifies the Config.in files accordingly.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2013-12-25 12:21:39 +01:00
Peter Korsgaard
30876b26a7 matchbox-desktop: needs zlib
Otherwise the build fails with:

In file included from mbdesktop_win_plugin.c:1:0:
mbdesktop.h:31:18: fatal error: zlib.h: No such file or directory

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-02-21 10:55:57 +01:00
Paulius Zaleckas
c2d6095f9f matchbox-common was missing in Config.in
While at it add option to install PDA style desktop folders.

Signed-off-by: Paulius Zaleckas <paulius.zaleckas@gmail.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-11-05 10:24:18 +01:00
Will Wagner
f94830d0e5 matchbox: convert to autotools, fix build with start-notification, libxft
Signed-off-by: Will Wagner <will_wagner@carallon.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-04-03 13:45:23 +02:00
Peter Korsgaard
41aaacd53d matchbox: depend on x11 support, rather than selecting it
Packages should depend on BR2_PACKAGE_XORG7 rather than selecting it,
because:
 - X brings in a lot of dependencies, so shouldn't get implicitly enabled
 - Select doesn't check dependencies, so build breaks if XORG dependencies
   aren't met (locale/wchar)

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2009-11-23 09:51:46 +01:00
Thomas Petazzoni
d776138bff matchbox: fix dependencies
A dependency on BR2_PACKAGE_XORG7 is enough, no need to depend on
BR2_PACKAGE_XORG_XSERVER.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-24 23:26:46 +02:00
Thomas Petazzoni
51ef5b8122 Fix Matchbox build
Several issues were encountered when trying to build Matchbox. This
patches fixes these issues :

 * Selecting BR2_PACKAGE_MATCHBOX should select BR2_PACKAGE_XORG7,
   otherwise the x11r7 mk files are not included, and matchbox.mk
   refers to non-existing dependencies (such as xlib_libXtst).

 * In matchbox.mk, wrong dependencies for Matchbox keyboard. When
   pango is available, use it through --enable-pango, otherwise, add
   the dependency to xlib_libXft

 * Enable AUTORECONF for libXfont and libXft, otherwise the libtool
   Buildroot patch has no effect, and these packages fail to build
   without the libtool hack.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-01 14:24:47 +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
e320fc667a package/matchbox: fix BR2_PACKAGE_MATCHBOX_KEYBOARD Kconfig
Fix typo and wrong information in help text (not a cvs snapshot)
2008-10-19 07:44:25 +00:00
Peter Korsgaard
f69afd8bd6 matchbox: fix long help text lines 2008-08-27 20:19:26 +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
Peter Korsgaard
565e05c8a1 packages: fix pkgconfig depencies and select pkgconfig where needed 2008-06-14 21:01:16 +00:00
Ulf Samuelsson
0c88f52fa8 Use new x11r7 configs 2007-08-12 14:11:02 +00:00
Ulf Samuelsson
54f3d3330c Add matchbox package 2007-08-12 11:31:06 +00:00