diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2010-07-20 23:29:42 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2010-07-20 23:29:42 +0200 |
| commit | fd5b0dc8fe3bb3f53e23553e0710baa64f6ae107 (patch) | |
| tree | 9bdda16916b2ba6605e2462121c750fa7825d5e4 /package/x11r7 | |
| parent | f242065eff73480932f3b9ef0c8d0da3651a10c6 (diff) | |
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>
Diffstat (limited to 'package/x11r7')
| -rw-r--r-- | package/x11r7/xserver_xorg-server/Config.in | 2 | ||||
| -rw-r--r-- | package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in index 8a8d10f3f..2d725e448 100644 --- a/package/x11r7/xserver_xorg-server/Config.in +++ b/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 diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index b0bc48b35..e32215f00 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/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 |