Pull request for branch for-2011.02/fix-bug-2983
The following changes since commit 11ab05f53a16f635a27139b33170a9dadba9f3c5:
Peter Korsgaard (1):
qt: svg and multimedia modules depends on gui module as well
are available in the git repository at:
git://git.busybox.net/~tpetazzoni/git/buildroot for-2011.02/fix-bug-2983
Thomas Petazzoni (1):
xlib_libX11: compile makekeys for the host correctly
package/x11r7/xlib_libX11/xlib_libX11.mk | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-)
Thanks,
Signature · 1 line
Thomas Petazzoni
PATCH 1/1 xlib_libX11: compile makekeys for the host correctly
As reported by Miroslav Ignjatovic in bug #2983, our hack in xlib_libX11 to build makekeys for the host does not work, for several reasons:
* As we are building a tool for the host, we shouldn't pass -I$(STAGING_DIR)/usr/include, since the $(STAGING_DIR) contains headers of packages for the target.
* Instead, we should use the headers in $(HOST_DIR)/usr/include. They were not used due to a type: $(HOST_CFLAGS) must be used instead of $(HOSTCFLAGS).
* Finally, in order for makekeys to find the required headers in $(HOST_DIR)/usr/include, we must depend on host-xproto_xproto.
This fixes bug #2983.
--- package/x11r7/xlib_libX11/xlib_libX11.mk | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-)
package/x11r7/xlib_libX11/xlib_libX11.mk +2 -3
@@ -9,7 +9,7 @@ XLIB_LIBX11_SOURCE = libX11-$(XLIB_LIBX11_VERSION).tar.bz2 XLIB_LIBX11_SITE = http://xorg.freedesktop.org/releases/individual/lib 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_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 host-xproto_xproto XLIB_LIBX11_CONF_OPT = \ --disable-malloc0returnsnull \ --with-xcb \
@@ -33,8 +33,7 @@ endef XLIB_LIBX11_POST_EXTRACT_HOOKS += XLIB_LIBX11_DISABLE_MAKEKEYS_BUILD define XLIB_LIBX11_BUILD_MAKEKEYS_FOR_HOST - cd $(@D)/src/util && $(HOSTCC) $(HOSTCFLAGS) \ - -I$(STAGING_DIR)/usr/include -o makekeys makekeys.c + cd $(@D)/src/util && $(HOSTCC) $(HOST_CFLAGS) -o makekeys makekeys.c endef XLIB_LIBX11_POST_CONFIGURE_HOOKS += XLIB_LIBX11_BUILD_MAKEKEYS_FOR_HOST
Signature · 1 line
1.7.0.4
PATCH 1/1 xlib_libX11: compile makekeys for the host correctly
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Thomas" == Thomas Petazzoni <[email protected]> writes:
Thomas> As reported by Miroslav Ignjatovic in bug #2983, our hack in Thomas> xlib_libX11 to build makekeys for the host does not work, for several Thomas> reasons:
Thomas> * As we are building a tool for the host, we shouldn't pass
Thomas> -I$(STAGING_DIR)/usr/include, since the $(STAGING_DIR) contains
Thomas> headers of packages for the target.
Thomas> * Instead, we should use the headers in $(HOST_DIR)/usr/include. They
Thomas> were not used due to a type: $(HOST_CFLAGS) must be used instead of
Thomas> $(HOSTCFLAGS).
s/type/typo/
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard