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>
This commit is contained in:
parent
9de1b4c81f
commit
7be1fd6c68
@ -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_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_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_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_LIBX11
|
||||||
select BR2_PACKAGE_XLIB_LIBXAU
|
select BR2_PACKAGE_XLIB_LIBXAU
|
||||||
select BR2_PACKAGE_XLIB_LIBXCURSOR
|
select BR2_PACKAGE_XLIB_LIBXCURSOR
|
||||||
|
@ -16,7 +16,6 @@ XSERVER_XORG_SERVER_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install install
|
|||||||
|
|
||||||
XSERVER_XORG_SERVER_DEPENDENCIES = \
|
XSERVER_XORG_SERVER_DEPENDENCIES = \
|
||||||
xutil_util-macros \
|
xutil_util-macros \
|
||||||
xlib_libpciaccess \
|
|
||||||
xlib_libXfont \
|
xlib_libXfont \
|
||||||
xlib_libX11 \
|
xlib_libX11 \
|
||||||
xlib_libXau \
|
xlib_libXau \
|
||||||
@ -66,6 +65,7 @@ XSERVER_XORG_SERVER_CONF_OPT = --disable-config-hal \
|
|||||||
|
|
||||||
ifeq ($(BR2_PACKAGE_XSERVER_xorg),y)
|
ifeq ($(BR2_PACKAGE_XSERVER_xorg),y)
|
||||||
XSERVER_XORG_SERVER_CONF_OPT += --enable-xorg --disable-glx
|
XSERVER_XORG_SERVER_CONF_OPT += --enable-xorg --disable-glx
|
||||||
|
XSERVER_XORG_SERVER_DEPENDENCIES += xlib_libpciaccess
|
||||||
else
|
else
|
||||||
XSERVER_XORG_SERVER_CONF_OPT += --disable-xorg
|
XSERVER_XORG_SERVER_CONF_OPT += --disable-xorg
|
||||||
endif
|
endif
|
||||||
|
Loading…
Reference in New Issue
Block a user