NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
300f9c9c9d
kumquat-buildroot/package/x11r7/xlib_libX11/xlib_libX11.mk

44 lines
1.9 KiB
Makefile
Raw Normal View History

Merge in X11R7 patches from Julien Letessier, posted 04 Jul 2007. Doesn't quite work yet for me, but this clearly is a huge project and not having it quite work on the first pass is hardly unexpected. We definately want this stuff in buildroot.
2007-08-10 21:07:51 +02:00
################################################################################
#
# xlib_libX11 -- X.Org X11 library
#
################################################################################
Bump libX11 to 1.3.2 Signed-off-by: Paulius Zaleckas <paulius.zaleckas@gmail.com>
2010-02-28 10:33:42 +01:00
XLIB_LIBX11_VERSION = 1.3.2
Merge in X11R7 patches from Julien Letessier, posted 04 Jul 2007. Doesn't quite work yet for me, but this clearly is a huge project and not having it quite work on the first pass is hardly unexpected. We definately want this stuff in buildroot.
2007-08-10 21:07:51 +02:00
XLIB_LIBX11_SOURCE = libX11-$(XLIB_LIBX11_VERSION).tar.bz2
XLIB_LIBX11_SITE = http://xorg.freedesktop.org/releases/individual/lib
libX11: fix build on hosts without libx11-dev Make sure the build doesn't use keysymdef.h from the host.
2009-03-29 21:10:30 +02:00
XLIB_LIBX11_AUTORECONF = YES
Merge in X11R7 patches from Julien Letessier, posted 04 Jul 2007. Doesn't quite work yet for me, but this clearly is a huge project and not having it quite work on the first pass is hardly unexpected. We definately want this stuff in buildroot.
2007-08-10 21:07:51 +02:00
XLIB_LIBX11_INSTALL_STAGING = YES
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 typo: $(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. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-12-21 14:14:53 +01:00
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: don't build documentation Closes #1387 The documentation step needs working groff and ps2pdf on the host, and only slows down the build, so just disable it. At the same time, cleanup the overlong _CONF_OPT line. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-03-31 12:13:51 +02:00
XLIB_LIBX11_CONF_OPT = \
--disable-malloc0returnsnull \
--with-xcb \
--with-keysymdef=$(STAGING_DIR)/usr/include/X11/keysymdef.h \
--disable-specs
Merge in X11R7 patches from Julien Letessier, posted 04 Jul 2007. Doesn't quite work yet for me, but this clearly is a huge project and not having it quite work on the first pass is hardly unexpected. We definately want this stuff in buildroot.
2007-08-10 21:07:51 +02:00
xlib_libX11: don't build docs for host It depends on utils provided by host system, and they sometimes are missing. Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-05-16 17:10:48 +02:00
HOST_XLIB_LIBX11_CONF_OPT = \
--disable-specs
xkeyboard-config: add dependency on host-xapp_xkbcomp In order to get xkeyboard-config to build, it needs xkbcomp to be built on the host, i.e host-xapp_xkbcomp. In turn, xapp_xkbcomp needs xlib_libX11 and xlib_libxkbfile, which in turn need a few libraries. This commit adds all the relevant dependencies to build everything that is needed to get xkeyboard-config to build correctly. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-07-22 15:37:16 +02:00
HOST_XLIB_LIBX11_DEPENDENCIES = host-xproto_xextproto host-libxcb host-xutil_util-macros host-xlib_xtrans host-xlib_libXau host-xlib_libXdmcp host-xproto_kbproto host-xproto_xproto host-xproto_xextproto host-xproto_inputproto host-xproto_xf86bigfontproto xproto_bigreqsproto host-xproto_xcmiscproto
libX11: fix build on hosts without libx11-dev Make sure the build doesn't use keysymdef.h from the host.
2009-03-29 21:10:30 +02:00
# 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: convert old-style hooks to new-style hooks Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-09-01 22:55:03 +02:00
define XLIB_LIBX11_DISABLE_MAKEKEYS_BUILD
libX11: fix build on hosts without libx11-dev Make sure the build doesn't use keysymdef.h from the host.
2009-03-29 21:10:30 +02:00
echo '' > $(@D)/src/util/Makefile.am
xlib_libX11: convert old-style hooks to new-style hooks Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-09-01 22:55:03 +02:00
endef
XLIB_LIBX11_POST_EXTRACT_HOOKS += XLIB_LIBX11_DISABLE_MAKEKEYS_BUILD
libX11: fix build on hosts without libx11-dev Make sure the build doesn't use keysymdef.h from the host.
2009-03-29 21:10:30 +02:00
xlib_libX11: convert old-style hooks to new-style hooks Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-09-01 22:55:03 +02:00
define XLIB_LIBX11_BUILD_MAKEKEYS_FOR_HOST
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 typo: $(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. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-12-21 14:14:53 +01:00
cd $(@D)/src/util && $(HOSTCC) $(HOST_CFLAGS) -o makekeys makekeys.c
xlib_libX11: convert old-style hooks to new-style hooks Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-09-01 22:55:03 +02:00
endef
XLIB_LIBX11_POST_CONFIGURE_HOOKS += XLIB_LIBX11_BUILD_MAKEKEYS_FOR_HOST
package: remove useless arguments from AUTOTARGETS Thanks to the pkgparentdir and pkgname functions, we can rewrite the AUTOTARGETS macro in a way that avoids the need for each package to repeat its name and the directory in which it is present. [Peter: pkgdir->pkgparentdir] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-09-29 21:57:43 +02:00
$(eval $(call AUTOTARGETS))
$(eval $(call AUTOTARGETS,host))
Reference in New Issue Copy Permalink