diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-02-24 17:44:13 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-02-24 17:44:13 +0100 |
| commit | 67cb0759e674470fa53fd3711d8460fd4a12c1a3 (patch) | |
| tree | b1f075ce06512879f327e1aa3abc3838b2de0539 /package/xorg-server | |
| parent | 0aabef127155575e8c8d660605f9401ab15356aa (diff) | |
| parent | 87832fb8da02431280c0a1f9c127dd121ddb7b25 (diff) | |
resolve conflict
Diffstat (limited to 'package/xorg-server')
| -rw-r--r-- | package/xorg-server/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile index 28abb1d5d..505a5d9d5 100644 --- a/package/xorg-server/Makefile +++ b/package/xorg-server/Makefile @@ -23,6 +23,7 @@ PKG_SITES:= ${MASTER_SITE_XORG} PKG_SUBPKGS:= XORG_SERVER XORG_SERVER_DEV PKG_CFLINE_XORG_SERVER:=depends on ADK_TARGET_WITH_VGA +PKG_ARCH_DEPENDS:= !cris PKG_FLAVOURS_XORG_SERVER:= WITH_DRI PKGFS_WITH_DRI:= mesalib |