diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2008-06-30 12:55:29 +0000 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2008-06-30 12:55:29 +0000 |
| commit | d4e56ff4dc8a0528550eb8503956bdcddb2fe516 (patch) | |
| tree | 2d6f8114da90ab526a5d7595c55ad8559de64366 /package/x11r7/xserver_xorg-server | |
| parent | af593cbceefb461c8c089395ff257c05cd290af7 (diff) | |
packages: fix xorg to compile modular and tiny versions
Based on googlecode r558 by John Voltz.
Diffstat (limited to 'package/x11r7/xserver_xorg-server')
| -rw-r--r-- | package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index a85b152da..994c4059d 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -9,6 +9,21 @@ XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.bz2 XSERVER_XORG_SERVER_SITE = http://xorg.freedesktop.org/releases/individual/xserver XSERVER_XORG_SERVER_AUTORECONF = NO XSERVER_XORG_SERVER_INSTALL_STAGING = YES + +ifeq ($(strip $(BR2_PACKAGE_XSERVER_xorg)),y) +XSERVER_XORG_MESA_DEPS:=mesa3d +XSERVER_XORG_MESA_DIR:=--with-mesa-source="$(BUILD_DIR)/Mesa-6.5.3" +XSERVER_XORG_ENABLE_MODULAR:=--enable-xorg +else +XSERVER_XORG_ENABLE_MODULAR:=--disable-xorg +endif + +ifeq ($(strip $(BR2_PACKAGE_XSERVER_tinyx)),y) +XSERVER_XORG_ENABLE_KDRIVE:=--enable-kdrive --enable-xfbdev +else +XSERVER_XORG_ENABLE_KDRIVE:=--disable-kdrive --disable-xfbdev +endif + XSERVER_XORG_SERVER_DEPENDENCIES = freetype xutil_util-macros xlib_libXfont libdrm xlib_libxkbui \ xproto_compositeproto xproto_damageproto xproto_fixesproto \ xproto_glproto xproto_kbproto xproto_randrproto freetype \ @@ -21,11 +36,12 @@ XSERVER_XORG_SERVER_DEPENDENCIES = freetype xutil_util-macros xlib_libXfont lib xproto_resourceproto xproto_trapproto xproto_videoproto xproto_xcmiscproto \ xproto_xextproto xproto_xf86bigfontproto xproto_xf86dgaproto xproto_xf86driproto \ xproto_xf86miscproto xproto_xf86rushproto xproto_xf86vidmodeproto xproto_xproto \ - pixman dbus mcookie + pixman dbus $(XSERVER_XORG_MESA_DEPS) mcookie -XSERVER_XORG_SERVER_CONF_OPT = --enable-kdrive --enable-xfbdev --enable-freetype --disable-kbd_mode --disable-xorg \ - --disable-config-hal CFLAGS="-I$(STAGING_DIR)/usr/include/pixman-1" +XSERVER_XORG_SERVER_CONF_OPT = $(XSERVER_XORG_ENABLE_KDRIVE) --enable-freetype $(XSERVER_XORG_ENABLE_MODULAR) \ + --disable-config-hal $(XSERVER_XORG_MESA_DIR) CFLAGS="-I$(STAGING_DIR)/usr/include/pixman-1" +XSERVER_XORG_SERVER_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install install-data XSERVER_XORG_SERVER_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install # Optional packages |