qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Current pixman lib doesn't build on m68k. Disable it on those machines.

Browse Source 
ok deraadt@
This commit is contained in:
matthieu 2010-08-02 18:45:02 +00:00
parent 3e56f14316
commit c9254707d2
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.19 2010/05/29 17:25:11 matthieu Exp $
# $OpenBSD: Makefile,v 1.20 2010/08/02 18:45:02 matthieu Exp $
.include <bsd.xconf.mk>
@ -46,7 +46,11 @@ SUBDIR= freetype fontconfig libxtrans libXau libXdmcp ${XCB_LIBS}\
libXi libXinerama libxkbfile libxkbui \
libXrandr libXRes libXScrnSaver \
libXtst libXv libXvMC libXxf86dga libXxf86misc libXxf86vm \
libpciaccess pixman
libpciaccess
.if ${XENOCARA_BUILD_PIXMAN:L} == "yes"
SUBDIR+= pixman
.endif
# libdrm is needed by the via driver built on i386 only
.if ${XENOCARA_BUILD_DRI:L} == "yes" || ${MACHINE} == "i386"

9
share/mk/bsd.xconf.mk
View File

@ -1,4 +1,4 @@
# $OpenBSD: bsd.xconf.mk,v 1.11 2009/08/04 15:45:41 matthieu Exp $
# $OpenBSD: bsd.xconf.mk,v 1.12 2010/08/02 18:45:02 matthieu Exp $
# Shared libs?
.if ${MACHINE_ARCH} == "m88k" || ${MACHINE} == "vax"
@ -13,3 +13,10 @@ XENOCARA_BUILD_DRI?=${XENOCARA_HAVE_SHARED_LIBS:L}
# Build XCB
XENOCARA_BUILD_XCB?=${XENOCARA_HAVE_SHARED_LIBS}
# Build pixmain?
.if ${MACHINE_ARCH} == "m68k"
XENOCARA_BUILD_PIXMAN?=no
.else
XENOCARA_BUILD_PIXMAN?=yes
.endif