diff options
| author | Darius Augulis <augulis.darius@gmail.com> | 2010-04-29 22:50:46 +0300 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2010-05-01 22:11:41 +0200 |
| commit | b64a031badac927368209a7455965d97f3fb015b (patch) | |
| tree | cfb6292ef94b9e98a993c4920038f3161f6a4c7a | |
| parent | 6ca43d88bcdaf415bfdee3e267a5c09e23d9f8f5 (diff) | |
Fix build of matchbox-keyboard and matchbox-wm
These packages have buggy configure script. It adds -L/lib flag
for linker and thus wrong libraries are linked in.
Workaround this issue by setting expat=yes in configure
environment.
Signed-off-by: Darius Augulis <augulis.darius@gmail.com>
Signed-off-by: Paulius Zaleckas <paulius.zaleckas@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
| -rw-r--r-- | package/matchbox/matchbox-keyboard/matchbox-keyboard.mk | 4 | ||||
| -rw-r--r-- | package/matchbox/matchbox-wm/matchbox-wm.mk | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk b/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk index 7c6d4557f..3d7178d14 100644 --- a/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk +++ b/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk @@ -8,7 +8,9 @@ MATCHBOX_KEYBOARD_VERSION = 0.1 MATCHBOX_KEYBOARD_SOURCE = matchbox-keyboard-$(MATCHBOX_KEYBOARD_VERSION).tar.bz2 MATCHBOX_KEYBOARD_SITE = http://matchbox-project.org/sources/matchbox-keyboard/$(MATCHBOX_KEYBOARD_VERSION) MATCHBOX_KEYBOARD_DEPENDENCIES = matchbox-lib matchbox-fakekey -MATCHBOX_KEYBOARD_CONF_OPT = --enable-expat + +# Workaround bug in configure script +MATCHBOX_KEYBOARD_CONF_ENV = expat=yes define MATCHBOX_KEYBOARD_POST_INSTALL_FIXES cp -dpf ./package/matchbox/matchbox-keyboard/mb-applet-kbd-wrapper.sh $(TARGET_DIR)/usr/bin/ diff --git a/package/matchbox/matchbox-wm/matchbox-wm.mk b/package/matchbox/matchbox-wm/matchbox-wm.mk index fbf3456e7..0334d0f0c 100644 --- a/package/matchbox/matchbox-wm/matchbox-wm.mk +++ b/package/matchbox/matchbox-wm/matchbox-wm.mk @@ -10,6 +10,9 @@ MATCHBOX_WM_SITE = http://matchbox-project.org/sources/matchbox-window-manager/$ MATCHBOX_WM_DEPENDENCIES = matchbox-lib MATCHBOX_WM_CONF_OPT = --enable-expat +# Workaround bug in configure script +MATCHBOX_WM_CONF_ENV = expat=yes + ############################################################# ifeq ($(BR2_PACKAGE_X11R7_LIBXCOMPOSITE),y) |