xserver: libpciaccess is not needed for tinyx

libpciaccess is only needed for the modular server, and as libpciaccess
needs largefile support and tinyx doesn't, this dependency could
cause a build failure.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in
index d57467568ac4bed13a3fb8c5792072b04ec95623..8a8d10f3f8a0bc2e15fecfa62f8bde97402d7d64 100644 (file)
--- a/package/x11r7/xserver_xorg-server/Config.in
+++ b/package/x11r7/xserver_xorg-server/Config.in
@@ -7,7 +7,7 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER
        select BR2_PACKAGE_XFONT_FONT_ALIAS if !BR2_PACKAGE_XSERVER_XORG_SERVER_BUILTIN_FONTS
        select BR2_PACKAGE_XFONT_FONT_MISC_MISC if !BR2_PACKAGE_XSERVER_XORG_SERVER_BUILTIN_FONTS
        select BR2_PACKAGE_XFONT_FONT_CURSOR_MISC if !BR2_PACKAGE_XSERVER_XORG_SERVER_BUILTIN_FONTS
-       select BR2_PACKAGE_XLIB_LIBPCIACCESS
+       select BR2_PACKAGE_XLIB_LIBPCIACCESS if BR2_PACKAGE_XSERVER_xorg
        select BR2_PACKAGE_XLIB_LIBX11
        select BR2_PACKAGE_XLIB_LIBXAU
        select BR2_PACKAGE_XLIB_LIBXCURSOR

diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index ba9a3b8bfedcd379a9d16fe3d60f5769ea9c1399..b0bc48b356525389bd21db2b4ef2899c68b44f8f 100644 (file)
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -16,7 +16,6 @@ XSERVER_XORG_SERVER_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install install
 
 XSERVER_XORG_SERVER_DEPENDENCIES =     \
        xutil_util-macros               \
-       xlib_libpciaccess               \
        xlib_libXfont                   \
        xlib_libX11                     \
        xlib_libXau                     \
@@ -66,6 +65,7 @@ XSERVER_XORG_SERVER_CONF_OPT = --disable-config-hal \
 
 ifeq ($(BR2_PACKAGE_XSERVER_xorg),y)
 XSERVER_XORG_SERVER_CONF_OPT += --enable-xorg --disable-glx
+XSERVER_XORG_SERVER_DEPENDENCIES += xlib_libpciaccess
 else
 XSERVER_XORG_SERVER_CONF_OPT += --disable-xorg
 endif