summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnout Vandecappelle <arnout@mind.be>2012-11-04 01:30:06 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2012-11-09 07:12:31 (GMT)
commitfc73d4d262bd9c1ba6f6874f93513d9ca56a1ddb (patch)
treea5d842ff8078a173b932f9dc0a66991009c3bb9a
parent35b7560a1bf9bc3a46ff9d3942fb38bc51c6e378 (diff)
downloadbuildroot-fc73d4d262bd9c1ba6f6874f93513d9ca56a1ddb.tar.gz
buildroot-fc73d4d262bd9c1ba6f6874f93513d9ca56a1ddb.tar.bz2
xlib_libX11: fix compilation of makekeys
xlib_libX11 builds a makekeys executable for the host, but uses the targets X11_CFLAGS. This leads to build failures like http://autobuild.buildroot.net/results/411eb3aefea859a7e31986a44acd50b475f174cb/ This problem was introduced by the version bump, because then also the AUTORECONF was removed so the existing fix didn't work anymore. As a slightly cleaner solution, just remove X11_CFLAGS from the Makefile. We know we don't need it, because the X11 stuff is in $(HOST_DIR)/usr/include which is already in HOST_CFLAGS. [Peter: reword comments] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/x11r7/xlib_libX11/xlib_libX11.mk19
1 files changed, 6 insertions, 13 deletions
diff --git a/package/x11r7/xlib_libX11/xlib_libX11.mk b/package/x11r7/xlib_libX11/xlib_libX11.mk
index 79b2d54..f7dc4eb 100644
--- a/package/x11r7/xlib_libX11/xlib_libX11.mk
+++ b/package/x11r7/xlib_libX11/xlib_libX11.mk
@@ -19,21 +19,14 @@ HOST_XLIB_LIBX11_CONF_OPT = \
# 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
-define XLIB_LIBX11_DISABLE_MAKEKEYS_BUILD
- echo '' > $(@D)/src/util/Makefile.am
+# doesn't have X11_CFLAGS_FOR_BUILD so this doesn't work. For buildroot,
+# we know the X11 includes are in $(HOST_DIR)/usr/include, which are already
+# in the CFLAGS_FOR_BUILD, so we can just remove the X11_CFLAGS
+define XLIB_LIBX11_DISABLE_MAKEKEYS_X11_CFLAGS
+ $(SED) '/X11_CFLAGS/d' $(@D)/src/util/Makefile*
endef
-XLIB_LIBX11_POST_EXTRACT_HOOKS += XLIB_LIBX11_DISABLE_MAKEKEYS_BUILD
-
-define XLIB_LIBX11_BUILD_MAKEKEYS_FOR_HOST
- cd $(@D)/src/util && $(HOSTCC) $(HOST_CFLAGS) -o makekeys makekeys.c
-endef
-
-XLIB_LIBX11_POST_CONFIGURE_HOOKS += XLIB_LIBX11_BUILD_MAKEKEYS_FOR_HOST
+XLIB_LIBX11_POST_PATCH_HOOKS += XLIB_LIBX11_DISABLE_MAKEKEYS_X11_CFLAGS
$(eval $(autotools-package))
$(eval $(host-autotools-package))