From b4927ea4c58170f975057ae2015e47d186138072 Mon Sep 17 00:00:00 2001
From: cjep <cjep>
Date: Thu, 20 Jun 2002 06:51:20 +0000
Subject: On NetBSD/arm, turn off optimisation on xmess and xmame as this
 prevents the packages from building.

---
 emulators/xmame/Makefile |  8 +++++---
 emulators/xmess/Makefile | 10 ++++++----
 2 files changed, 11 insertions(+), 7 deletions(-)

(limited to 'emulators')

diff --git a/emulators/xmame/Makefile b/emulators/xmame/Makefile
index de0a623c559..8d3c063b894 100644
--- a/emulators/xmame/Makefile
+++ b/emulators/xmame/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.75 2002/05/20 13:14:19 cjep Exp $
+# $NetBSD: Makefile,v 1.76 2002/06/20 06:51:21 cjep Exp $
 #
 
 DISTNAME=		xmame-0.60.1
@@ -23,8 +23,10 @@ UNLIMIT_RESOURCES=	datasize
 
 .include "../../mk/bsd.prefs.mk"
 
-.if (${MACHINE_ARCH} == "arm32" && ${CFLAGS} == "-O2")
-CFLAGS=			-O0
+.if (${MACHINE_ARCH} == "arm32" || ${MACHINE_ARCH} == "arm")
+.if (${CFLAGS:M-O2} == "-O2")
+CFLAGS=         ${CFLAGS:S/-O2/-O0/} 
+.endif
 .endif
 
 ROMPATH=		${PREFIX}/share/${TARGET}
diff --git a/emulators/xmess/Makefile b/emulators/xmess/Makefile
index e4197f2dd9e..2ae39d761b4 100644
--- a/emulators/xmess/Makefile
+++ b/emulators/xmess/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2002/05/20 11:08:28 cjep Exp $
+# $NetBSD: Makefile,v 1.22 2002/06/20 06:51:20 cjep Exp $
 #
 
 DISTNAME=		xmame-0.56.2
@@ -23,9 +23,11 @@ UNLIMIT_RESOURCES=	datasize
 
 .include "../../mk/bsd.prefs.mk"
 
-# XXX On arm32, the src/unix/video_drivers/x11_window.c causes problems
-.if (${MACHINE_ARCH} == "arm32" && ${CFLAGS} == "-O2")
-CFLAGS="-O0"
+# XXX On arm(32), the src/unix/video_drivers/x11_window.c causes problems
+.if (${MACHINE_ARCH} == "arm32" || ${MACHINE_ARCH} == "arm") 
+.if (${CFLAGS:M-O2} == "-O2")
+CFLAGS=		${CFLAGS:S/-O2/-O0/}
+.endif
 .endif
 
 ROMPATH=		${PREFIX}/share/${TARGET}
-- 
cgit v1.2.3