svn commit: r380043 - in head/net/mpich: . files
Tijl Coosemans
tijl at FreeBSD.org
Thu Feb 26 18:07:14 UTC 2015
Author: tijl
Date: Thu Feb 26 18:07:11 2015
New Revision: 380043
URL: https://svnweb.freebsd.org/changeset/ports/380043
QAT: https://qat.redports.org/buildarchive/r380043/
Log:
- Update to MPICH 3.1.4
- Pass *FLAGS variables to configure via MPICHLIB_*FLAGS because otherwise
they are hardcoded into mpicc [1]
PR: 197563 [1]
Added:
head/net/mpich/files/
head/net/mpich/files/patch-src-mpi-pt2pt-greq_start.c (contents, props changed)
head/net/mpich/files/patch-src-mutex-mutex_create.c (contents, props changed)
head/net/mpich/files/patch-src-mutex-mutex_free.c (contents, props changed)
head/net/mpich/files/patch-src-mutex-mutex_lock.c (contents, props changed)
head/net/mpich/files/patch-src-mutex-mutex_unlock.c (contents, props changed)
Modified:
head/net/mpich/Makefile
head/net/mpich/distinfo
head/net/mpich/pkg-plist
Modified: head/net/mpich/Makefile
==============================================================================
--- head/net/mpich/Makefile Thu Feb 26 17:47:06 2015 (r380042)
+++ head/net/mpich/Makefile Thu Feb 26 18:07:11 2015 (r380043)
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= mpich
-PORTVERSION= 3.1.3
+PORTVERSION= 3.1.4
CATEGORIES= net parallel
MASTER_SITES= http://www.mpich.org/static/downloads/${DISTVERSION}/
@@ -17,6 +17,7 @@ LIB_DEPENDS= libhwloc.so:${PORTSDIR}/dev
CONFLICTS= lam-7.* mpd-[0-9]* mpiexec-0.* mpich2-[0-9]*
GNU_CONFIGURE= yes
+INSTALL_TARGET= install-strip
USES= libtool pkgconfig
USE_LDCONFIG= yes
@@ -28,16 +29,27 @@ OPTIONS_RADIO_DEFAULTPM=DGFORKER DHYDRA
OPTIONS_DEFAULT= HYDRA DHYDRA
OPTIONS_SUB= yes
-FORTRAN_CONFIGURE_ENABLE= fortran
FORTRAN_USES= fortran
+FORTRAN_CONFIGURE_ENABLE= fortran
+FORTRAN_CONFIGURE_ON= \
+ MPICH_LDFLAGS="-Wl,-rpath=${LOCALBASE}/lib/gcc${_GCC_VER} \
+ -L${LOCALBASE}/lib/gcc${_GCC_VER} -B${LOCALBASE}/bin"
GFORKER_DESC= Simple local process manager
HYDRA_DESC= Parallel process manager
DGFORKER_DESC= Make gforker the default process manager
DHYDRA_DESC= Make hydra the default process manager
-CONFIGURE_ARGS= --with-hwloc-prefix=${LOCALBASE} ac_cv_path_BASH_SHELL="" \
- pkgconfigdir="${PREFIX}/libdata/pkgconfig"
+CONFIGURE_ARGS= --enable-fast="" --with-hwloc-prefix=${LOCALBASE} \
+ ac_cv_path_BASH_SHELL="" \
+ pkgconfigdir="${PREFIX}/libdata/pkgconfig" \
+ MPICHLIB_CFLAGS="${CFLAGS}" CFLAGS="" \
+ MPICHLIB_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="" \
+ MPICHLIB_CXXFLAGS="${CXXFLAGS}" CXXFLAGS="" \
+ MPICHLIB_FFLAGS="${FFLAGS}" FFLAGS="" \
+ MPICHLIB_FCFLAGS="${FCFLAGS}" FCFLAGS="" \
+ MPICHLIB_LDFLAGS="${LDFLAGS}" LDFLAGS="" \
+ MPICHLIB_LIBS="${LIBS}" LIBS=""
.include <bsd.port.options.mk>
@@ -66,4 +78,7 @@ PLIST_SUB+= EXECGFORKER="@comment "
.endif
.endif
+post-patch:
+ @${RM} -r ${WRKSRC}/www
+
.include <bsd.port.mk>
Modified: head/net/mpich/distinfo
==============================================================================
--- head/net/mpich/distinfo Thu Feb 26 17:47:06 2015 (r380042)
+++ head/net/mpich/distinfo Thu Feb 26 18:07:11 2015 (r380043)
@@ -1,2 +1,2 @@
-SHA256 (mpich-3.1.3.tar.gz) = afb690aa828467721e9d9ab233fe00c68cae2b7b930d744cb5f7f3eb08c8602c
-SIZE (mpich-3.1.3.tar.gz) = 11487313
+SHA256 (mpich-3.1.4.tar.gz) = f68b5330e94306c00ca5a1c0e8e275c7f53517d01d6c524d51ce9359d240466b
+SIZE (mpich-3.1.4.tar.gz) = 11325036
Added: head/net/mpich/files/patch-src-mpi-pt2pt-greq_start.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/mpich/files/patch-src-mpi-pt2pt-greq_start.c Thu Feb 26 18:07:11 2015 (r380043)
@@ -0,0 +1,29 @@
+--- src/mpi/pt2pt/greq_start.c.orig 2015-02-20 20:48:13 UTC
++++ src/mpi/pt2pt/greq_start.c
+@@ -236,7 +236,7 @@ int MPIX_Grequest_class_create(MPI_Grequ
+ MPI_Grequest_cancel_function *cancel_fn,
+ MPIX_Grequest_poll_function *poll_fn,
+ MPIX_Grequest_wait_function *wait_fn,
+- MPIX_Grequest_class *greq_class) __attribute__((weak,alias("MPIX_Grequest_class_create")));
++ MPIX_Grequest_class *greq_class) __attribute__((weak,alias("PMPIX_Grequest_class_create")));
+ #endif
+ /* -- End Profiling Symbol Block */
+
+@@ -328,7 +328,7 @@ fn_fail:
+ #elif defined(HAVE_PRAGMA_CRI_DUP)
+ #pragma _CRI duplicate MPIX_Grequest_class_allocate as PMPIX_Grequest_class_allocate
+ #elif defined(HAVE_WEAK_ATTRIBUTE)
+-int MPIX_Grequest_class_allocate(MPIX_Grequest_class greq_class, void *extra_state, MPI_Request *request) __attribute__((weak,alias("MPIX_Grequest_class_allocate")));
++int MPIX_Grequest_class_allocate(MPIX_Grequest_class greq_class, void *extra_state, MPI_Request *request) __attribute__((weak,alias("PMPIX_Grequest_class_allocate")));
+ #endif
+ /* -- End Profiling Symbol Block */
+
+@@ -379,7 +379,7 @@ int MPIX_Grequest_start( MPI_Grequest_qu
+ MPIX_Grequest_poll_function *poll_fn,
+ MPIX_Grequest_wait_function *wait_fn,
+ void *extra_state,
+- MPI_Request *request ) __attribute__((weak,alias("MPIX_Grequest_start")));
++ MPI_Request *request ) __attribute__((weak,alias("PMPIX_Grequest_start")));
+ #endif
+ /* -- End Profiling Symbol Block */
+
Added: head/net/mpich/files/patch-src-mutex-mutex_create.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/mpich/files/patch-src-mutex-mutex_create.c Thu Feb 26 18:07:11 2015 (r380043)
@@ -0,0 +1,11 @@
+--- src/mutex/mutex_create.c.orig 2015-02-20 20:48:13 UTC
++++ src/mutex/mutex_create.c
+@@ -23,7 +23,7 @@
+ #elif defined(HAVE_PRAGMA_CRI_DUP)
+ #pragma _CRI duplicate MPIX_Mutex_create as PMPIX_Mutex_create
+ #elif defined(HAVE_WEAK_ATTRIBUTE)
+-int MPIX_Mutex_create(int my_count, MPI_Comm comm, MPIX_Mutex * hdl_out) __attribute__((weak,alias("MPIX_Mutex_create")));
++int MPIX_Mutex_create(int my_count, MPI_Comm comm, MPIX_Mutex * hdl_out) __attribute__((weak,alias("PMPIX_Mutex_create")));
+ #endif
+ /* -- End Profiling Symbol Block */
+
Added: head/net/mpich/files/patch-src-mutex-mutex_free.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/mpich/files/patch-src-mutex-mutex_free.c Thu Feb 26 18:07:11 2015 (r380043)
@@ -0,0 +1,11 @@
+--- src/mutex/mutex_free.c.orig 2015-02-20 20:48:13 UTC
++++ src/mutex/mutex_free.c
+@@ -20,7 +20,7 @@
+ #elif defined(HAVE_PRAGMA_CRI_DUP)
+ #pragma _CRI duplicate MPIX_Mutex_free as PMPIX_Mutex_free
+ #elif defined(HAVE_WEAK_ATTRIBUTE)
+-int MPIX_Mutex_free(MPIX_Mutex * hdl_ptr) __attribute__((weak,alias("MPIX_Mutex_free")));
++int MPIX_Mutex_free(MPIX_Mutex * hdl_ptr) __attribute__((weak,alias("PMPIX_Mutex_free")));
+ #endif
+ /* -- End Profiling Symbol Block */
+
Added: head/net/mpich/files/patch-src-mutex-mutex_lock.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/mpich/files/patch-src-mutex-mutex_lock.c Thu Feb 26 18:07:11 2015 (r380043)
@@ -0,0 +1,11 @@
+--- src/mutex/mutex_lock.c.orig 2015-02-20 20:48:13 UTC
++++ src/mutex/mutex_lock.c
+@@ -21,7 +21,7 @@
+ #elif defined(HAVE_PRAGMA_CRI_DUP)
+ #pragma _CRI duplicate MPIX_Mutex_lock as PMPIX_Mutex_lock
+ #elif defined(HAVE_WEAK_ATTRIBUTE)
+-int MPIX_Mutex_lock(MPIX_Mutex hdl, int mutex, int proc) __attribute__((weak,alias("MPIX_Mutex_lock")));
++int MPIX_Mutex_lock(MPIX_Mutex hdl, int mutex, int proc) __attribute__((weak,alias("PMPIX_Mutex_lock")));
+ #endif
+ /* -- End Profiling Symbol Block */
+
Added: head/net/mpich/files/patch-src-mutex-mutex_unlock.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/mpich/files/patch-src-mutex-mutex_unlock.c Thu Feb 26 18:07:11 2015 (r380043)
@@ -0,0 +1,11 @@
+--- src/mutex/mutex_unlock.c.orig 2015-02-20 20:48:13 UTC
++++ src/mutex/mutex_unlock.c
+@@ -21,7 +21,7 @@
+ #elif defined(HAVE_PRAGMA_CRI_DUP)
+ #pragma _CRI duplicate MPIX_Mutex_unlock as PMPIX_Mutex_unlock
+ #elif defined(HAVE_WEAK_ATTRIBUTE)
+-int MPIX_Mutex_unlock(MPIX_Mutex hdl, int mutex, int proc) __attribute__((weak,alias("MPIX_Mutex_unlock")));
++int MPIX_Mutex_unlock(MPIX_Mutex hdl, int mutex, int proc) __attribute__((weak,alias("PMPIX_Mutex_unlock")));
+ #endif
+ /* -- End Profiling Symbol Block */
+
Modified: head/net/mpich/pkg-plist
==============================================================================
--- head/net/mpich/pkg-plist Thu Feb 26 17:47:06 2015 (r380042)
+++ head/net/mpich/pkg-plist Thu Feb 26 18:07:11 2015 (r380043)
@@ -45,18 +45,18 @@ include/primitives/opa_unsafe.h
lib/libmpi.a
lib/libmpi.so
lib/libmpi.so.12
-lib/libmpi.so.12.0.4
+lib/libmpi.so.12.0.5
lib/libmpich.so
lib/libmpichcxx.so
%%FORTRAN%%lib/libmpichf90.so
lib/libmpicxx.a
lib/libmpicxx.so
lib/libmpicxx.so.12
-lib/libmpicxx.so.12.0.4
+lib/libmpicxx.so.12.0.5
%%FORTRAN%%lib/libmpifort.a
%%FORTRAN%%lib/libmpifort.so
%%FORTRAN%%lib/libmpifort.so.12
-%%FORTRAN%%lib/libmpifort.so.12.0.4
+%%FORTRAN%%lib/libmpifort.so.12.0.5
lib/libmpl.so
lib/libopa.so
libdata/pkgconfig/mpich.pc
More information about the svn-ports-head
mailing list