Date: Wed, 13 May 2020 00:18:55 +0000 (UTC) From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r535075 - in head/devel/ga: . files Message-ID: <202005130018.04D0It8P043161@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: yuri Date: Wed May 13 00:18:54 2020 New Revision: 535075 URL: https://svnweb.freebsd.org/changeset/ports/535075 Log: devel/ga: Add the MPICH and OPENMPI options in order to support OpenMPI as well Added: head/devel/ga/files/ head/devel/ga/files/patch-Makefile.am (contents, props changed) Modified: head/devel/ga/Makefile Modified: head/devel/ga/Makefile ============================================================================== --- head/devel/ga/Makefile Wed May 13 00:14:49 2020 (r535074) +++ head/devel/ga/Makefile Wed May 13 00:18:54 2020 (r535075) @@ -3,6 +3,7 @@ PORTNAME= ga DISTVERSIONPREFIX= v DISTVERSION= 5.7.2 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= yuri@FreeBSD.org @@ -15,7 +16,6 @@ LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-se LIB_DEPENDS= libblas.so:math/blas \ liblapack.so:math/lapack \ - libmpich.so:net/mpich \ libscalapack.so:math/scalapack USES= autoreconf fortran gmake libtool localbase @@ -27,5 +27,20 @@ INSTALL_TARGET= install-strip USE_LDCONFIG= yes LDFLAGS+= -lscalapack + +OPTIONS_RADIO= MPI +OPTIONS_RADIO_MPI= MPICH OPENMPI +OPTIONS_DEFAULT= MPICH # the default should be the same as for the MPI option in math/scalapack + +MPICH_LIB_DEPENDS= libmpich.so:net/mpich + +OPENMPI_BUILD_DEPENDS= openmpi>0:net/openmpi +OPENMPI_RUN_DEPENDS= openmpi>0:net/openmpi +OPENMPI_CONFIGURE_ENV= CC=${LOCALBASE}/mpi/openmpi/bin/mpicc MPICC=${LOCALBASE}/mpi/openmpi/bin/mpicc \ + CXX=${LOCALBASE}/mpi/openmpi/bin/mpic++ MPICXX=${LOCALBASE}/mpi/openmpi/bin/mpic++ \ + F77=${LOCALBASE}/mpi/openmpi/bin/mpif77 MPIF77=${LOCALBASE}/mpi/openmpi/bin/mpif77 \ + FC=${LOCALBASE}/mpi/openmpi/bin/mpif90 MPIFC=${LOCALBASE}/mpi/openmpi/bin/mpif90 \ + LDFLAGS="-L${LOCALBASE}/mpi/openmpi/lib -Wl,-rpath,${LOCALBASE}/mpi/openmpi/lib" +OPENMPI_MAKE_ARGS= FREEBSD_LINK_FLAGS="-L${LOCALBASE}/mpi/openmpi/lib -Wl,-rpath,${LOCALBASE}/mpi/openmpi/lib -lmpi" .include <bsd.port.mk> Added: head/devel/ga/files/patch-Makefile.am ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/ga/files/patch-Makefile.am Wed May 13 00:18:54 2020 (r535075) @@ -0,0 +1,16 @@ +--- Makefile.am.orig 2020-02-28 19:39:16 UTC ++++ Makefile.am +@@ -1649,11 +1649,11 @@ libga_la_LIBADD += $(MAYBE_FLIBS) + # if --disable-f77 is used, we must override linker choice + if ENABLE_F77 + libga_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) \ +- $(LIBTOOLFLAGS) --mode=link $(F77LD) $(AM_FFLAGS) $(FFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(F77LD) $(FREEBSD_LINK_FLAGS) $(AM_FFLAGS) $(FFLAGS) \ + $(libga_la_LDFLAGS) $(LDFLAGS) -o $@ + else + libga_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ +- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(FREEBSD_LINK_FLAGS) (AM_CFLAGS) $(CFLAGS) \ + $(libga_la_LDFLAGS) $(LDFLAGS) -o $@ + endif +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202005130018.04D0It8P043161>