summaryrefslogtreecommitdiffstats
path: root/package/x11r7/xlib_libX11
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2013-01-06 11:29:21 +0000
committerPeter Korsgaard <jacmet@sunsite.dk>2013-01-12 22:35:32 +0100
commit0a0330a582b58fd3d874a56d3a2ce57fc4fc4445 (patch)
treecaf83921e519111a0b388e1347784387e5c51ac4 /package/x11r7/xlib_libX11
parent3679abe0a32e2559c81a9f47820c9af47ee1f84f (diff)
downloadbuildroot-novena-0a0330a582b58fd3d874a56d3a2ce57fc4fc4445.tar.gz
buildroot-novena-0a0330a582b58fd3d874a56d3a2ce57fc4fc4445.zip
xlib_libX11: do not depend on bigreqsproto nor xcmiscproto
The BR2_PACKAGE_XPROTO_BIGREQSPROTO option was selected by xlib_libX11, but xlib_libX11 does not have this protocol package in its DEPENDENCIES. In some builds, it leads to xproto_bigreqsproto to be built as the last package, with no other package depending on it, which doesn't make sense. xproto_xcmiscproto was selected and part of DEPENDENCIES, but an inspection of libX11 configure.ac and libX11 source code shows that it does not depend on xcmiscproto at all. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/x11r7/xlib_libX11')
-rw-r--r--package/x11r7/xlib_libX11/Config.in2
-rw-r--r--package/x11r7/xlib_libX11/xlib_libX11.mk2
2 files changed, 1 insertions, 3 deletions
diff --git a/package/x11r7/xlib_libX11/Config.in b/package/x11r7/xlib_libX11/Config.in
index e1189ff57..3ad8d00ae 100644
--- a/package/x11r7/xlib_libX11/Config.in
+++ b/package/x11r7/xlib_libX11/Config.in
@@ -10,7 +10,5 @@ config BR2_PACKAGE_XLIB_LIBX11
select BR2_PACKAGE_XPROTO_XEXTPROTO
select BR2_PACKAGE_XPROTO_INPUTPROTO
select BR2_PACKAGE_XPROTO_XF86BIGFONTPROTO
- select BR2_PACKAGE_XPROTO_BIGREQSPROTO
- select BR2_PACKAGE_XPROTO_XCMISCPROTO
help
X.Org X11 library
diff --git a/package/x11r7/xlib_libX11/xlib_libX11.mk b/package/x11r7/xlib_libX11/xlib_libX11.mk
index 75d172cb4..94107b2ba 100644
--- a/package/x11r7/xlib_libX11/xlib_libX11.mk
+++ b/package/x11r7/xlib_libX11/xlib_libX11.mk
@@ -8,7 +8,7 @@ XLIB_LIBX11_VERSION = 1.4.2
XLIB_LIBX11_SOURCE = libX11-$(XLIB_LIBX11_VERSION).tar.bz2
XLIB_LIBX11_SITE = http://xorg.freedesktop.org/releases/individual/lib
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_xcmiscproto host-xproto_xproto
+XLIB_LIBX11_DEPENDENCIES = libxcb xutil_util-macros xlib_xtrans xlib_libXau xlib_libXdmcp xproto_kbproto xproto_xproto xproto_xextproto xproto_inputproto xproto_xf86bigfontproto host-xproto_xproto
XLIB_LIBX11_CONF_OPT = \
--disable-malloc0returnsnull \
--with-xcb \