Fix build of matchbox-keyboard and matchbox-wm
PATCH 1/1 Fix build of matchbox-keyboard and matchbox-wm
From: Darius Augulis <[email protected]>
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 <[email protected]>
Signed-off-by Paulius Zaleckas <[email protected]>
---
.../matchbox-keyboard/matchbox-keyboard.mk | 4 +++- package/matchbox/matchbox-wm/matchbox-wm.mk | 3 +++ 2 files changed, 6 insertions(+), 1 deletions(-)
package/matchbox/matchbox-keyboard/matchbox-keyboard.mk +3 -1
@@ -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/
package/matchbox/matchbox-wm/matchbox-wm.mk +3 -0
@@ -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)
PATCH 1/1 Fix build of matchbox-keyboard and matchbox-wm
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Paulius" == Paulius Zaleckas <[email protected]> writes:
Paulius> From: Darius Augulis <[email protected]> Paulius> These packages have buggy configure script. It adds -L/lib flag Paulius> for linker and thus wrong libraries are linked in. Paulius> Workaround this issue by setting expat=yes in configure Paulius> environment.
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard