Commit 7be1fd6c authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

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: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 9de1b4c8

package/x11r7/xserver_xorg-server/Config.in

+1 −1
Original line number Diff line number Diff line
@@ -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

package/x11r7/xserver_xorg-server/xserver_xorg-server.mk

+1 −1
Original line number Diff line number Diff line
@@ -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