From 67b48c229e64bccf3584681ab63f82f197fb4249 Mon Sep 17 00:00:00 2001
From: kristerw <kristerw@pkgsrc.org>
Date: Sat, 31 Jan 2004 01:23:16 +0000
Subject: Compilation of the tryulong32.c configuration test takes ~forever on
 arm/gcc 2.95.3.  Add a workaround.

---
 databases/cdb/Makefile         |  6 +-----
 databases/cdb/distinfo         |  3 ++-
 databases/cdb/patches/patch-aa | 19 +++++++++++++++++++
 3 files changed, 22 insertions(+), 6 deletions(-)
 create mode 100644 databases/cdb/patches/patch-aa

(limited to 'databases/cdb')

diff --git a/databases/cdb/Makefile b/databases/cdb/Makefile
index 120287178c6..b0343f10393 100644
--- a/databases/cdb/Makefile
+++ b/databases/cdb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/09/17 19:40:08 grant Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/31 01:23:16 kristerw Exp $
 
 DISTNAME=	cdb-0.75
 CATEGORIES=	databases
@@ -11,10 +11,6 @@ COMMENT=	Creates and reads constant databases
 ALL_TARGET=	it
 INSTALL_TARGET=	setup check
 
-.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-USE_PKGSRC_GCC=		# defined
-.endif
-
 pre-build:
 	${ECHO} ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc
 	${ECHO} ${CC} ${_STRIPFLAG_CC} > ${WRKSRC}/conf-ld
diff --git a/databases/cdb/distinfo b/databases/cdb/distinfo
index dbf336a2604..037eea2a1ee 100644
--- a/databases/cdb/distinfo
+++ b/databases/cdb/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2001/12/10 18:11:46 martti Exp $
+$NetBSD: distinfo,v 1.2 2004/01/31 01:23:16 kristerw Exp $
 
 SHA1 (cdb-0.75.tar.gz) = 555749be5b2617e29e44b5326a2536813d62c248
 Size (cdb-0.75.tar.gz) = 54162 bytes
+SHA1 (patch-aa) = 7e7a4e20ca36c3e773c729c0f0d751ac6340ccda
diff --git a/databases/cdb/patches/patch-aa b/databases/cdb/patches/patch-aa
new file mode 100644
index 00000000000..edb55cc007c
--- /dev/null
+++ b/databases/cdb/patches/patch-aa
@@ -0,0 +1,19 @@
+$NetBSD: patch-aa,v 1.1 2004/01/31 01:23:16 kristerw Exp $
+
+--- tryulong32.c.orig	Sat Jan 31 02:15:54 2004
++++ tryulong32.c	Sat Jan 31 02:16:38 2004
+@@ -1,5 +1,8 @@
+ void main()
+ {
++#ifdef __arm__
++  _exit(0);
++#else
+   unsigned long u;
+   u = 1;
+   u += u; u += u; u += u; u += u; u += u; u += u; u += u; u += u;
+@@ -8,4 +11,5 @@
+   u += u; u += u; u += u; u += u; u += u; u += u; u += u; u += u;
+   if (!u) _exit(0);
+   _exit(1);
++#endif
+ }
-- 
cgit v1.2.3