diff options
| author | Todd T. Fries <todd@cvs.openbsd.org> | 2010-08-25 17:44:28 +0000 |
|---|---|---|
| committer | Todd T. Fries <todd@cvs.openbsd.org> | 2010-08-25 17:44:28 +0000 |
| commit | e39f747dc230a82dfb30cb5c666f61ce93bee3d7 (patch) | |
| tree | 6038c5ec7f8cf09a836759ecc015183a8336a8ce | |
| parent | 87a3b39fdcbf70728c9be369d3863d20035d3c60 (diff) | |
enable pixman (with a workaround from miod@) for m68k, fixes hp300 and mvme68k
| -rw-r--r-- | lib/libGL/glsl/Makefile.inc | 4 | ||||
| -rw-r--r-- | lib/pixman/Makefile.bsd-wrapper | 7 | ||||
| -rw-r--r-- | share/mk/bsd.xconf.mk | 8 |
3 files changed, 11 insertions, 8 deletions
diff --git a/lib/libGL/glsl/Makefile.inc b/lib/libGL/glsl/Makefile.inc index 7e2bb7d41..9af73c621 100644 --- a/lib/libGL/glsl/Makefile.inc +++ b/lib/libGL/glsl/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.1 2010/05/22 20:14:15 matthieu Exp $ +# $OpenBSD: Makefile.inc,v 1.2 2010/08/25 17:44:24 todd Exp $ .if ${MACHINE_ARCH} == powerpc || ${MACHINE_ARCH} == sparc @@ -10,7 +10,9 @@ OBJS = ${C_SOURCES:.c=.so} CPPFLAGS = \ -I${.CURDIR} ${LIBRARY_INCLUDES} +.if defined(LIB) all: ${LIB}_pic.a +.endif ${LIB}_pic.a: ${OBJS} $(DPADD) @rm -f ${LIB}_pic.a diff --git a/lib/pixman/Makefile.bsd-wrapper b/lib/pixman/Makefile.bsd-wrapper index d5a2b0a6f..afa52b59d 100644 --- a/lib/pixman/Makefile.bsd-wrapper +++ b/lib/pixman/Makefile.bsd-wrapper @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.10 2010/05/11 18:51:21 espie Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.11 2010/08/25 17:44:26 todd Exp $ .include <bsd.own.mk> @@ -12,4 +12,9 @@ CONFIGURE_ARGS += --disable-sse2 CONFIGURE_ARGS += --disable-arm-simd --disable-arm-neon .endif +.if ${MACHINE_ARCH} == m68k +CFLAGS += -fno-regmove +CONFIGURE_ARGS += --cache-file=/dev/null +.endif + .include <bsd.xorg.mk> diff --git a/share/mk/bsd.xconf.mk b/share/mk/bsd.xconf.mk index 3331d5d6f..b7b2ef617 100644 --- a/share/mk/bsd.xconf.mk +++ b/share/mk/bsd.xconf.mk @@ -1,4 +1,4 @@ -# $OpenBSD: bsd.xconf.mk,v 1.12 2010/08/02 18:45:02 matthieu Exp $ +# $OpenBSD: bsd.xconf.mk,v 1.13 2010/08/25 17:44:27 todd Exp $ # Shared libs? .if ${MACHINE_ARCH} == "m88k" || ${MACHINE} == "vax" @@ -14,9 +14,5 @@ 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 +# Build pixman? XENOCARA_BUILD_PIXMAN?=yes -.endif |