From de38fd55ec1efdb22398646c6213c814330969a1 Mon Sep 17 00:00:00 2001
From: cjep <cjep@pkgsrc.org>
Date: Sat, 22 Mar 2003 11:58:16 +0000
Subject: Respect CFLAGS. On arm, turn off optimization so that this package
 finishes building (at least on NetBSD/shark).

---
 emulators/simh/Makefile         | 10 +++++++++-
 emulators/simh/distinfo         |  4 ++--
 emulators/simh/patches/patch-aa |  4 ++--
 3 files changed, 13 insertions(+), 5 deletions(-)

(limited to 'emulators')

diff --git a/emulators/simh/Makefile b/emulators/simh/Makefile
index 8c9c4c187d9..22c85b72518 100644
--- a/emulators/simh/Makefile
+++ b/emulators/simh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2002/11/28 12:00:26 agc Exp $
+# $NetBSD: Makefile,v 1.11 2003/03/22 11:58:16 cjep Exp $
 #
 
 DISTNAME=	simhv210-0b2
@@ -18,6 +18,14 @@ WRKSRC=		${WRKDIR}
 
 EXTRACT_CMD=	unzip -aoq ${DOWNLOADED_DISTFILE}
 
+.include "../../mk/bsd.prefs.mk"
+
+.if (${MACHINE_ARCH} == "arm")
+.if (${CFLAGS:M-O2} == "-O2")
+CFLAGS:=	${CFLAGS:S/-O2//}
+.endif
+.endif
+
 post-extract:
 	${MKDIR} ${WRKSRC}/BIN
 	${MV} ${WRKSRC}/makefile ${WRKSRC}/Makefile
diff --git a/emulators/simh/distinfo b/emulators/simh/distinfo
index ab45c544efa..049ae6ffaaf 100644
--- a/emulators/simh/distinfo
+++ b/emulators/simh/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.7 2003/01/18 21:17:32 bouyer Exp $
+$NetBSD: distinfo,v 1.8 2003/03/22 11:58:16 cjep Exp $
 
 SHA1 (simhv210-0b2.zip) = 841669853d24f7b2b608442806eeaa083f2dd7ab
 Size (simhv210-0b2.zip) = 1555874 bytes
 SHA1 (xq_beta5.zip) = a66fe7fecb76737632e262ae40c3d59147071a7e
 Size (xq_beta5.zip) = 24582 bytes
-SHA1 (patch-aa) = 29fc614b64358b50e5181a186edf339cd18de17a
+SHA1 (patch-aa) = e14a00127c162fcaf626f251722d5aaf9d439f09
 SHA1 (patch-ab) = 516740338b0648a7503b2cbac00ff6bbec086c9e
diff --git a/emulators/simh/patches/patch-aa b/emulators/simh/patches/patch-aa
index e11d2183feb..aa3e727fa06 100644
--- a/emulators/simh/patches/patch-aa
+++ b/emulators/simh/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.4 2002/10/19 21:38:10 thorpej Exp $
+$NetBSD: patch-aa,v 1.5 2003/03/22 11:58:17 cjep Exp $
 
 --- Makefile.orig	Sat Oct 19 14:23:26 2002
 +++ Makefile	Sat Oct 19 14:24:16 2002
@@ -8,7 +8,7 @@ $NetBSD: patch-aa,v 1.4 2002/10/19 21:38:10 thorpej Exp $
  #
 -CC = gcc -O2 -lm -I .
 -#CC = gcc -O2 -g -lm -I .
-+CC = gcc -O2 -lm -lpcap -I .
++CC = gcc ${CFLAGS} -lm -lpcap -I .
 +#CC = gcc -O2 -g -lm -lpcap -I .
  
  
-- 
cgit v1.2.3