فهرست منبع

xserver: libdrm is not needed for tinyx

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

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Peter Korsgaard 15 سال پیش
والد
کامیت
fd5b0dc8fe
2فایلهای تغییر یافته به همراه2 افزوده شده و 3 حذف شده
  1. 1 1
      package/x11r7/xserver_xorg-server/Config.in
  2. 1 2
      package/x11r7/xserver_xorg-server/xserver_xorg-server.mk

+ 1 - 1
package/x11r7/xserver_xorg-server/Config.in

@@ -1,6 +1,6 @@
 config BR2_PACKAGE_XSERVER_XORG_SERVER
 	bool "xorg-server"
-	select BR2_PACKAGE_LIBDRM
+	select BR2_PACKAGE_LIBDRM if BR2_PACKAGE_XSERVER_xorg
 	select BR2_PACKAGE_MCOOKIE
 	select BR2_PACKAGE_OPENSSL
 	select BR2_PACKAGE_PIXMAN

+ 1 - 2
package/x11r7/xserver_xorg-server/xserver_xorg-server.mk

@@ -53,7 +53,6 @@ XSERVER_XORG_SERVER_DEPENDENCIES = 	\
 	xproto_xf86rushproto 		\
 	xproto_xf86vidmodeproto 	\
 	xproto_xproto 			\
-	libdrm 				\
 	pixman 				\
 	openssl 			\
 	mcookie
@@ -65,7 +64,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
+XSERVER_XORG_SERVER_DEPENDENCIES += xlib_libpciaccess libdrm
 else
 XSERVER_XORG_SERVER_CONF_OPT += --disable-xorg
 endif