Sun Jun 19 18:13:00 2016 UTC ()
Remove INSTALLATION_PREFIX; no change to package.


(wiz)
diff -r1.80 -r1.81 pkgsrc/parallel/mpi-ch/Makefile
cvs diff -r1.80 -r1.81 pkgsrc/parallel/mpi-ch/Makefile (switch to unified diff)

--- pkgsrc/parallel/mpi-ch/Makefile 2015/09/23 12:02:50 1.80
+++ pkgsrc/parallel/mpi-ch/Makefile 2016/06/19 18:13:00 1.81
@@ -1,60 +1,59 @@ @@ -1,60 +1,59 @@
1# $NetBSD: Makefile,v 1.80 2015/09/23 12:02:50 joerg Exp $ 1# $NetBSD: Makefile,v 1.81 2016/06/19 18:13:00 wiz Exp $
2 2
3DISTNAME= mpich-3.0.4 3DISTNAME= mpich-3.0.4
4PKGREVISION= 3 4PKGREVISION= 3
5CATEGORIES= parallel 5CATEGORIES= parallel
6MASTER_SITES= http://www.mpich.org/static/tarballs/${PKGVERSION_NOREV}/ 6MASTER_SITES= http://www.mpich.org/static/tarballs/${PKGVERSION_NOREV}/
7 7
8MAINTAINER= asau@inbox.ru 8MAINTAINER= asau@inbox.ru
9HOMEPAGE= http://www.mpich.org/ 9HOMEPAGE= http://www.mpich.org/
10COMMENT= Open source MPI, MPI-2, and MPI-3 implementation from Univ. of Chicago 10COMMENT= Open source MPI, MPI-2, and MPI-3 implementation from Univ. of Chicago
11 11
12DEPENDS+= bash-[0-9]*:../../shells/bash 12DEPENDS+= bash-[0-9]*:../../shells/bash
13 13
14#MPI_SUBPREFIX= mpich 14#MPI_SUBPREFIX= mpich
15#MPI_PREFIX= ${LOCALBASE}/${MPI_SUBPREFIX} 15#MPI_PREFIX= ${LOCALBASE}/${MPI_SUBPREFIX}
16MPI_PREFIX= ${LOCALBASE} 16MPI_PREFIX= ${LOCALBASE}
17INSTALLATION_PREFIX= ${MPI_PREFIX} 
18 17
19OVERRIDE_DIRDEPTH= 3 18OVERRIDE_DIRDEPTH= 3
20 19
21USE_LANGUAGES= c c++ 20USE_LANGUAGES= c c++
22USE_LIBTOOL= yes 21USE_LIBTOOL= yes
23USE_TOOLS+= perl:run 22USE_TOOLS+= perl:run
24GNU_CONFIGURE= yes 23GNU_CONFIGURE= yes
25GNU_CONFIGURE_PREFIX= ${MPI_PREFIX} 24GNU_CONFIGURE_PREFIX= ${MPI_PREFIX}
26CONFIGURE_ARGS+= --datadir=${MPI_PREFIX}/share/${PKGBASE} 25CONFIGURE_ARGS+= --datadir=${MPI_PREFIX}/share/${PKGBASE}
27CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 26CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
28CONFIGURE_ARGS+= --docdir=${MPI_PREFIX}/share/doc/${PKGBASE} 27CONFIGURE_ARGS+= --docdir=${MPI_PREFIX}/share/doc/${PKGBASE}
29CONFIGURE_ARGS+= --htmldir=${MPI_PREFIX}/share/doc/${PKGBASE}/html 28CONFIGURE_ARGS+= --htmldir=${MPI_PREFIX}/share/doc/${PKGBASE}/html
30CONFIGURE_ARGS+= --with-openpa-prefix=${BUILDLINK_PREFIX.openpa} 29CONFIGURE_ARGS+= --with-openpa-prefix=${BUILDLINK_PREFIX.openpa}
31CONFIGURE_ARGS+= --with-hwloc-prefix=${BUILDLINK_PREFIX.hwloc} 30CONFIGURE_ARGS+= --with-hwloc-prefix=${BUILDLINK_PREFIX.hwloc}
32CONFIGURE_ARGS+= --with-pm=hydra:gforker 31CONFIGURE_ARGS+= --with-pm=hydra:gforker
33# Make MPI compiler wrapper usable outside pkgsrc: 32# Make MPI compiler wrapper usable outside pkgsrc:
34CONFIGURE_ENV+= WRAPPER_LDFLAGS="-L${MPI_PREFIX}/lib ${COMPILER_RPATH_FLAG}${MPI_PREFIX}/lib" 33CONFIGURE_ENV+= WRAPPER_LDFLAGS="-L${MPI_PREFIX}/lib ${COMPILER_RPATH_FLAG}${MPI_PREFIX}/lib"
35CONFIGURE_ENV+= MPICH_LDFLAGS="-L${MPI_PREFIX}/lib ${COMPILER_RPATH_FLAG}${MPI_PREFIX}/lib" 34CONFIGURE_ENV+= MPICH_LDFLAGS="-L${MPI_PREFIX}/lib ${COMPILER_RPATH_FLAG}${MPI_PREFIX}/lib"
36 35
37PKG_SYSCONFSUBDIR= mpich 36PKG_SYSCONFSUBDIR= mpich
38 37
39BUILDLINK_PASSTHRU_RPATHDIRS+= ${MPI_PREFIX}/lib 38BUILDLINK_PASSTHRU_RPATHDIRS+= ${MPI_PREFIX}/lib
40 39
41CONF_FILES+= share/${PKGBASE}/examples/mpicc.conf \ 40CONF_FILES+= share/${PKGBASE}/examples/mpicc.conf \
42 ${PKG_SYSCONFDIR}/mpicc.conf 41 ${PKG_SYSCONFDIR}/mpicc.conf
43CONF_FILES+= share/${PKGBASE}/examples/mpicxx.conf \ 42CONF_FILES+= share/${PKGBASE}/examples/mpicxx.conf \
44 ${PKG_SYSCONFDIR}/mpicxx.conf 43 ${PKG_SYSCONFDIR}/mpicxx.conf
45CONF_FILES+= share/${PKGBASE}/examples/mpif77.conf \ 44CONF_FILES+= share/${PKGBASE}/examples/mpif77.conf \
46 ${PKG_SYSCONFDIR}/mpif77.conf 45 ${PKG_SYSCONFDIR}/mpif77.conf
47 46
48# FreeBSD 6 hack: 47# FreeBSD 6 hack:
49.include "../../mk/bsd.prefs.mk" 48.include "../../mk/bsd.prefs.mk"
50.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly" 49.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly"
51BUILDLINK_TRANSFORM+= rm:-lrt 50BUILDLINK_TRANSFORM+= rm:-lrt
52.endif 51.endif
53 52
54.include "options.mk" 53.include "options.mk"
55 54
56TEST_TARGET= check 55TEST_TARGET= check
57 56
58.include "../../parallel/hwloc/buildlink3.mk" 57.include "../../parallel/hwloc/buildlink3.mk"
59.include "../../parallel/openpa/buildlink3.mk" 58.include "../../parallel/openpa/buildlink3.mk"
60.include "../../mk/bsd.pkg.mk" 59.include "../../mk/bsd.pkg.mk"