diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2009-06-25 10:43:01 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2009-07-01 14:24:47 +0200 |
| commit | 51ef5b81224c243aa7f937c4690b1a120c81ccbc (patch) | |
| tree | 5242e0adf211c9fd70490171a51ce51758a9b978 /package/x11r7 | |
| parent | e61606ad39735000e66b6048d9be1b9d27c36bd0 (diff) | |
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>
Diffstat (limited to 'package/x11r7')
| -rw-r--r-- | package/x11r7/xlib_libXfont/xlib_libXfont.mk | 2 | ||||
| -rw-r--r-- | package/x11r7/xlib_libXft/xlib_libXft.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/package/x11r7/xlib_libXfont/xlib_libXfont.mk b/package/x11r7/xlib_libXfont/xlib_libXfont.mk index 39b25fc81..a64b74ef2 100644 --- a/package/x11r7/xlib_libXfont/xlib_libXfont.mk +++ b/package/x11r7/xlib_libXfont/xlib_libXfont.mk @@ -7,7 +7,7 @@ XLIB_LIBXFONT_VERSION = 1.3.3 XLIB_LIBXFONT_SOURCE = libXfont-$(XLIB_LIBXFONT_VERSION).tar.bz2 XLIB_LIBXFONT_SITE = http://xorg.freedesktop.org/releases/individual/lib -XLIB_LIBXFONT_AUTORECONF = NO +XLIB_LIBXFONT_AUTORECONF = YES XLIB_LIBXFONT_INSTALL_STAGING = YES XLIB_LIBXFONT_DEPENDENCIES = freetype xlib_libfontenc xlib_xtrans xproto_fontcacheproto xproto_fontsproto xproto_xproto xfont_encodings XLIB_LIBXFONT_CONF_OPT = --enable-shared --disable-static diff --git a/package/x11r7/xlib_libXft/xlib_libXft.mk b/package/x11r7/xlib_libXft/xlib_libXft.mk index b112d235e..5ae3f1701 100644 --- a/package/x11r7/xlib_libXft/xlib_libXft.mk +++ b/package/x11r7/xlib_libXft/xlib_libXft.mk @@ -7,7 +7,7 @@ XLIB_LIBXFT_VERSION = 2.1.13 XLIB_LIBXFT_SOURCE = libXft-$(XLIB_LIBXFT_VERSION).tar.bz2 XLIB_LIBXFT_SITE = http://xorg.freedesktop.org/releases/individual/lib -XLIB_LIBXFT_AUTORECONF = NO +XLIB_LIBXFT_AUTORECONF = YES XLIB_LIBXFT_INSTALL_STAGING = YES XLIB_LIBXFT_DEPENDENCIES = fontconfig freetype xlib_libX11 xlib_libXext xlib_libXrender xproto_xproto XLIB_LIBXFT_CONF_OPT = --enable-shared --disable-static |