From 14567aad360da7e55432bd66d14dbc9f2f980a21 Mon Sep 17 00:00:00 2001
From: wennmach <wennmach>
Date: Tue, 2 Dec 2003 20:13:38 +0000
Subject: Disable weak symbols for gcc>3*. While weak symbols do work on
 NetBSD-current, the way mpi-ch test for them and implements them (using the
 #pragma weak directive) is currently broken.

Fixes PR pkg/23267 by Kouichirou Hiratsuka.
---
 parallel/mpi-ch/Makefile | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

(limited to 'parallel')

diff --git a/parallel/mpi-ch/Makefile b/parallel/mpi-ch/Makefile
index aa94a73f22b..8d661692e24 100644
--- a/parallel/mpi-ch/Makefile
+++ b/parallel/mpi-ch/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2003/11/27 17:02:25 wennmach Exp $
+# $NetBSD: Makefile,v 1.24 2003/12/02 20:13:38 wennmach Exp $
 
 DISTNAME=		mpich-1.2.5-1a
 PKGNAME=		mpich-1.2.5.1.1
-PKGREVISION=		2
+PKGREVISION=		3
 WRKSRC=			${WRKDIR}/${DISTNAME:C/-1a//}
 CATEGORIES=		parallel
 MASTER_SITES=		ftp://ftp.mcs.anl.gov/pub/mpi/
@@ -25,16 +25,24 @@ USE_X11=		yes
 
 MPI_RSH?=		ssh
 
-CONFIGURE_ARGS=		-prefix=${PREFIX} --with-arch=netbsd --with-comm=ch_p4
+.include "../../mk/bsd.prefs.mk"
+
+CONFIGURE_ARGS=		-prefix=${PREFIX}
 CONFIGURE_ARGS+=	-docdir=${PREFIX}/share/doc/mpi-ch
 CONFIGURE_ARGS+=	-htmldir=${PREFIX}/share/doc/html/mpi-ch
-CONFIGURE_ARGS+=	--with-mpe -opt=-O --disable-devdebug
-CONFIGURE_ARGS+=	--disable-f90 --disable-f90modules
+CONFIGURE_ARGS+=	-opt=-O
+CONFIGURE_ARGS+=	--with-arch=netbsd
+CONFIGURE_ARGS+=	--with-comm=ch_p4
+CONFIGURE_ARGS+=	--with-mpe
+CONFIGURE_ARGS+=	--disable-devdebug
+CONFIGURE_ARGS+=	--disable-f90
+CONFIGURE_ARGS+=	--disable-f90modules
+.if !empty(CC_VERSION:Mgcc-3*)
+CONFIGURE_ARGS+=	--disable-weak-symbols
+.endif
 
 MAKE_ENV+=		RSHCOMMAND="${MPI_RSH}"
 
-.include "../../mk/bsd.prefs.mk"
-
 PLIST_SRC+=		${PKGDIR}/PLIST
 
 .if ${MPI_RSH} == "rsh"
-- 
cgit v1.2.3