summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2010-07-24 20:34:03 +0200
committerPeter Korsgaard <jacmet@sunsite.dk>2010-07-24 20:34:03 +0200
commitc03cab1430326beea676ce25b1abd20b45b42568 (patch)
treebdd16c1a20a4483bb70a9ed18b96fc3bbc360aa3
parent3435c1afb58307240be8e4607b5bb7d239fac4e9 (diff)
xserver-xorg: disable SDL kdrive server
Otherwise the build breaks if the SDL package is enabled, as xserver's configure script detects SDL support, but doesn't find our sdl-config script, so linking fails. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/x11r7/xserver_xorg-server/xserver_xorg-server.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index f3ffea9e8..7c12d2454 100644
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -70,7 +70,8 @@ XSERVER_XORG_SERVER_CONF_OPT += --disable-xorg
endif
ifeq ($(BR2_PACKAGE_XSERVER_tinyx),y)
-XSERVER_XORG_SERVER_CONF_OPT += --enable-kdrive --enable-xfbdev --disable-glx --disable-dri
+XSERVER_XORG_SERVER_CONF_OPT += --enable-kdrive --enable-xfbdev \
+ --disable-glx --disable-dri --disable-xsdl
else
XSERVER_XORG_SERVER_CONF_OPT += --disable-kdrive --disable-xfbdev
endif