diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2009-03-29 19:10:30 +0000 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2009-03-29 19:10:30 +0000 |
| commit | cccc5a26272570b4b18b3a04236c0742d1cbc471 (patch) | |
| tree | 53d0a016b7dc72f939e8aded6972e1d361ec6f92 /package/x11r7/xlib_libX11/xlib_libX11.mk | |
| parent | 6099e286e2b254517bb8ec63cad5131b1dc9539b (diff) | |
libX11: fix build on hosts without libx11-dev
Make sure the build doesn't use keysymdef.h from the host.
Diffstat (limited to 'package/x11r7/xlib_libX11/xlib_libX11.mk')
| -rw-r--r-- | package/x11r7/xlib_libX11/xlib_libX11.mk | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/package/x11r7/xlib_libX11/xlib_libX11.mk b/package/x11r7/xlib_libX11/xlib_libX11.mk index e5619668d..270e5ece4 100644 --- a/package/x11r7/xlib_libX11/xlib_libX11.mk +++ b/package/x11r7/xlib_libX11/xlib_libX11.mk @@ -7,10 +7,25 @@ XLIB_LIBX11_VERSION = 1.1.5 XLIB_LIBX11_SOURCE = libX11-$(XLIB_LIBX11_VERSION).tar.bz2 XLIB_LIBX11_SITE = http://xorg.freedesktop.org/releases/individual/lib -XLIB_LIBX11_AUTORECONF = NO +XLIB_LIBX11_AUTORECONF = YES XLIB_LIBX11_INSTALL_STAGING = YES XLIB_LIBX11_DEPENDENCIES = libxcb xutil_util-macros xlib_xtrans xlib_libXau xlib_libXdmcp xproto_kbproto xproto_xproto xproto_xextproto xproto_inputproto xproto_xf86bigfontproto xproto_bigreqsproto xproto_xcmiscproto -XLIB_LIBX11_CONF_ENV = ac_cv_func_mmap_fixed_mapped=yes CC_FOR_BUILD="/usr/bin/gcc -I$(STAGING_DIR)/usr/include" -XLIB_LIBX11_CONF_OPT = --disable-malloc0returnsnull --with-xcb --enable-shared --disable-static +XLIB_LIBX11_CONF_ENV = ac_cv_func_mmap_fixed_mapped=yes +XLIB_LIBX11_CONF_OPT = --disable-malloc0returnsnull --with-xcb --enable-shared --disable-static --with-keysymdef=$(STAGING_DIR)/usr/include/X11/keysymdef.h $(eval $(call AUTOTARGETS,package/x11r7,xlib_libX11)) + +# src/util/makekeys is executed at build time to generate ks_tables.h, so +# it should get compiled for the host. The libX11 makefile unfortunately +# doesn't know about cross compilation so this doesn't work. +# Long term, we should probably teach it about HOSTCC / HOST_CFLAGS, but for +# now simply disable the src/util Makefile and build makekeys by hand in +# advance +$(XLIB_LIBX11_HOOK_POST_EXTRACT): + echo '' > $(@D)/src/util/Makefile.am + touch $@ + +$(XLIB_LIBX11_HOOK_POST_CONFIGURE): + cd $(@D)/src/util && $(HOSTCC) $(HOSTCFLAGS) \ + -I$(STAGING_DIR)/usr/include -o makekeys makekeys.c + touch $@ |