ports/151869: benchmarks/hpl: chase net/mpich2 upgrade

[Thierry Thomas]

>Number:         151869
>Category:       ports
>Synopsis:       benchmarks/hpl: chase net/mpich2 upgrade
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Nov 01 16:00:27 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Thierry Thomas
>Release:        FreeBSD 8.1-STABLE i386
>Organization:
Kabbale Eros
>Environment:
System: FreeBSD graf.pompo.net 8.1-STABLE FreeBSD 8.1-STABLE #0: Sun Aug 22 11:07:29 CEST 2010 thierry at graf.pompo.net:/usr/obj/usr/src/sys/GRAF100821 i386


	
>Description:
	When upgrading net/mpich2, hpl must be modified.

	PR 51867: http://www.freebsd.org/cgi/query-pr.cgi?pr=151867

	Note: to fix hpl, I propose to link it with mpl and -pthread.
	Another solution could be to use mpicc.

>How-To-Repeat:
	- Apply PR 51867 to upgrade mpich2;
	- then apply the attached patch.

>Fix:

--- hpl.diff begins here ---
diff -urN benchmarks/hpl.orig/Makefile benchmarks/hpl/Makefile
--- benchmarks/hpl.orig/Makefile	2010-02-07 15:03:19.000000000 +0100
+++ benchmarks/hpl/Makefile	2010-11-01 15:47:12.000000000 +0100
@@ -7,7 +7,7 @@
 
 PORTNAME=	hpl
 PORTVERSION=	2.0
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	benchmarks
 MASTER_SITES=	http://www.netlib.org/benchmark/hpl/
 
@@ -15,8 +15,7 @@
 COMMENT=	High Performance Computing Linpack Benchmark
 
 .if !defined(WITH_LAM)
-BUILD_DEPENDS=	${LOCALBASE}/bin/mpicc:${PORTSDIR}/net/mpich2
-RUN_DEPENDS=	${LOCALBASE}/bin/mpicc:${PORTSDIR}/net/mpich2
+LIB_DEPENDS=	mpich.2:${PORTSDIR}/net/mpich2
 .else
 BUILD_DEPENDS=	${LOCALBASE}/bin/lamd:${PORTSDIR}/net/lam
 RUN_DEPENDS=	${LOCALBASE}/bin/lamd:${PORTSDIR}/net/lam
@@ -83,7 +82,7 @@
 		s|^LINKER[ ]*=.*$$|LINKER = ${FC}| ; \
 		s|^ARCHIVER[ ]*=.*$$|ARCHIVER = ${AR}| ; \
 		s|ARCH[ )]|_&|g ; \
-		s|libpmpich|libmpich|g' \
+		s|libpmpich.a|libmpl.a ${PTHREAD_LIBS}|' \
 		${WRKSRC}/setup/Make.${HPL_ARCH}
 
 .if defined(WITH_LAM)
--- hpl.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: