From fb6c29f8bf248017425abf6954a2caa089d0837e Mon Sep 17 00:00:00 2001
From: abs <abs@pkgsrc.org>
Date: Wed, 11 Jun 2003 20:50:50 +0000
Subject: Update for the fact that 'arm' ports have been called NetBSD-*-arm
 for a while now and not NetBSD-*-arm32. Changes include one or more of:     -
 Change MACHINE_ARCH == arm32 to also match arm     - Where ONLY_FOR_PLATFORM
 includes NetBSD-*-arm32, add NetBSD-*-arm     - Where BROKEN or worked around
 for arm gcc bugs, set USE_GCC3 The last may shake out a few more broken
 packages the next bulk build.

---
 databases/cdb/Makefile          | 9 ++++-----
 databases/mysql-server/Makefile | 7 ++++---
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'databases')

diff --git a/databases/cdb/Makefile b/databases/cdb/Makefile
index 24097ec236b..c4cd1945cde 100644
--- a/databases/cdb/Makefile
+++ b/databases/cdb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2002/07/22 00:13:13 schmonz Exp $
+# $NetBSD: Makefile,v 1.6 2003/06/11 20:50:51 abs Exp $
 
 DISTNAME=	cdb-0.75
 CATEGORIES=	databases
@@ -11,10 +11,9 @@ COMMENT=	creates and reads constant databases
 ALL_TARGET=	it
 INSTALL_TARGET=	setup check
 
-.if (${MACHINE_ARCH} == "arm32" || ${MACHINE_ARCH} == "arm")
-.if (${CFLAGS:M-O2} == "-O2")
-CFLAGS:=	${CFLAGS:S/-O2/-O0/}
-.endif
+.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
+USE_GCC3=YES
+.  include "../../mk/gcc.buildlink2.mk"
 .endif
 
 pre-build:
diff --git a/databases/mysql-server/Makefile b/databases/mysql-server/Makefile
index 298c98923a9..99f3daed0ba 100644
--- a/databases/mysql-server/Makefile
+++ b/databases/mysql-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2003/03/24 03:06:34 grant Exp $
+# $NetBSD: Makefile,v 1.38 2003/06/11 20:50:51 abs Exp $
 
 PKGNAME=		${DISTNAME:S/-/-server-/}
 PKGREVISION=		3
@@ -28,8 +28,9 @@ ONLY_FOR_PLATFORM+=	NetBSD-*-*
 CONFIGURE_ARGS+=	--with-mit-threads
 
 # platforms on which included mit-pthreads is usable
-ONLY_FOR_PLATFORM+=	NetBSD-*-alpha NetBSD-*-arm32 NetBSD-*-i386	\
-			NetBSD-*-sparc NetBSD-*-m68k NetBSD-*-powerpc
+ONLY_FOR_PLATFORM+=	NetBSD-*-alpha NetBSD-arm NetBSD-*-arm32	\
+			NetBSD-*-i386 NetBSD-*-sparc NetBSD-*-m68k	\
+			NetBSD-*-powerpc
 .  endif
 .endif
 
-- 
cgit v1.2.3