From ff15966c2ecc9258232ac49edf31c7f904eaf225 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 25 Jun 2010 11:33:25 +0200 Subject: xlib_libXt: fix build issues The .mk file was hacking the CC_FOR_BUILD value so that $(STAGING_DIR)/usr/include is added to the include path. This is not correct since $(STAGING_DIR) contains target stuff, not host stuff. The correct fix is to add a dependency on host-xproto_xproto, which will install the needed headers in $(HOST_DIR)/usr/include. In addition to that, a patch is added to make xlib_libXt build system behave properly in the cross-compilation case, where the makestrs tool needs to be built on the host as part of the compilation process. This was working before because of our quirky TARGET_CONFIGURE_OPTS, but those are going to be fixed in a future commit. Signed-off-by: Thomas Petazzoni --- package/x11r7/xlib_libXt/xlib_libXt.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'package/x11r7/xlib_libXt/xlib_libXt.mk') diff --git a/package/x11r7/xlib_libXt/xlib_libXt.mk b/package/x11r7/xlib_libXt/xlib_libXt.mk index e3e43e4f6..38ebe1c7e 100644 --- a/package/x11r7/xlib_libXt/xlib_libXt.mk +++ b/package/x11r7/xlib_libXt/xlib_libXt.mk @@ -10,8 +10,7 @@ XLIB_LIBXT_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXT_AUTORECONF = YES XLIB_LIBXT_LIBTOOL_PATCH = NO XLIB_LIBXT_INSTALL_STAGING = YES -XLIB_LIBXT_DEPENDENCIES = xlib_libSM xlib_libX11 xproto_kbproto xproto_xproto xcb-proto libxcb -XLIB_LIBXT_CONF_ENV = CC_FOR_BUILD="/usr/bin/gcc -I$(STAGING_DIR)/usr/include" +XLIB_LIBXT_DEPENDENCIES = xlib_libSM xlib_libX11 xproto_kbproto xproto_xproto xcb-proto libxcb host-xproto_xproto XLIB_LIBXT_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static --disable-install-makestrs $(eval $(call AUTOTARGETS,package/x11r7,xlib_libXt)) -- cgit v1.2.3