diff options
| author | Todd T. Fries <todd@cvs.openbsd.org> | 2013-02-21 17:45:35 +0000 |
|---|---|---|
| committer | Todd T. Fries <todd@cvs.openbsd.org> | 2013-02-21 17:45:35 +0000 |
| commit | 26661ed39e715ea950c98cbba96d8cd3aa0bb2e1 (patch) | |
| tree | 892283581cc0eb3631b90d136842e4a612d49192 | |
| parent | a53cfe7d0e23b384475bf42e9a7c51eca1e9479d (diff) | |
after a compiler update, landisk can now handle pixman and thus xserver again
prodded by brad@, ok matthieu@
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | share/mk/bsd.xconf.mk | 4 |
2 files changed, 4 insertions, 4 deletions
@@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.50 2012/12/01 21:10:42 miod Exp $ +# $OpenBSD: Makefile,v 1.51 2013/02/21 17:45:32 todd Exp $ .include <bsd.own.mk> .include <bsd.xconf.mk> @@ -8,7 +8,7 @@ REALAPPD=/etc/X11/app-defaults XCONFIG=${XSRCDIR}/etc/X11.${MACHINE}/xorg.conf RM?=rm -.if ${MACHINE_ARCH} != "sh" && ${MACHINE_ARCH} != "vax" +.if ${MACHINE_ARCH} != "vax" XSERVER= xserver .endif diff --git a/share/mk/bsd.xconf.mk b/share/mk/bsd.xconf.mk index 2c339f0d8..5409d9b1d 100644 --- a/share/mk/bsd.xconf.mk +++ b/share/mk/bsd.xconf.mk @@ -1,4 +1,4 @@ -# $OpenBSD: bsd.xconf.mk,v 1.22 2013/02/09 21:48:07 brad Exp $ +# $OpenBSD: bsd.xconf.mk,v 1.23 2013/02/21 17:45:34 todd Exp $ # Shared libs? .if ${MACHINE} == "vax" @@ -12,7 +12,7 @@ XENOCARA_BUILD_GL?=${XENOCARA_HAVE_SHARED_LIBS:L} XENOCARA_BUILD_DRI?=${XENOCARA_HAVE_SHARED_LIBS:L} # Build pixman? -.if ${MACHINE} == "vax" || ${MACHINE} == "landisk" +.if ${MACHINE} == "vax" XENOCARA_BUILD_PIXMAN?=no .else XENOCARA_BUILD_PIXMAN?=yes |