gitolite/buildrootschalter
gitolite
/
buildrootschalter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Peter Korsgaard 2014-05-20 23:40:37 +02:00
parent ffacbf7ec2
commit 39b926d968
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package/matchbox/Config.in
View File

@ -36,6 +36,7 @@ config BR2_PACKAGE_MATCHBOX_COMMON_PDA
config BR2_PACKAGE_MATCHBOX_KEYBOARD
bool "Matchbox Virtual Keyboard"
select BR2_PACKAGE_XLIB_LIBXTST
select BR2_PACKAGE_XLIB_LIBXFT if !BR2_PACKAGE_CAIRO
help
Virtual Keyboard

7
package/matchbox/matchbox-keyboard/matchbox-keyboard.mk
View File

@ -9,7 +9,7 @@ MATCHBOX_KEYBOARD_SOURCE = matchbox-keyboard-$(MATCHBOX_KEYBOARD_VERSION).tar.bz
MATCHBOX_KEYBOARD_SITE = http://downloads.yoctoproject.org/releases/matchbox/matchbox-keyboard/$(MATCHBOX_KEYBOARD_VERSION)
MATCHBOX_KEYBOARD_LICENSE = GPLv2+
MATCHBOX_KEYBOARD_LICENSE_FILES = COPYING
MATCHBOX_KEYBOARD_DEPENDENCIES = matchbox-lib matchbox-fakekey
MATCHBOX_KEYBOARD_DEPENDENCIES = host-pkgconf matchbox-lib matchbox-fakekey expat
# Workaround bug in configure script
MATCHBOX_KEYBOARD_CONF_ENV = expat=yes
@ -22,8 +22,9 @@ MATCHBOX_KEYBOARD_POST_INSTALL_TARGET_HOOKS += MATCHBOX_KEYBOARD_POST_INSTALL_FI
################################################################################
ifeq ($(BR2_PACKAGE_PANGO),y)
MATCHBOX_PKEYBOARD_CONF_OPT += --enable-pango
ifeq ($(BR2_PACKAGE_CAIRO),y)
MATCHBOX_KEYBOARD_CONF_OPT += --enable-cairo
MATCHBOX_KEYBOARD_DEPENDENCIES += cairo
else
MATCHBOX_KEYBOARD_DEPENDENCIES += xlib_libXft
endif