From owner-svn-ports-head@freebsd.org Wed May 13 00:18:56 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9B2A62E1EEB; Wed, 13 May 2020 00:18:56 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49MFdq6FcJz4H86; Wed, 13 May 2020 00:18:55 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9356218B3A; Wed, 13 May 2020 00:18:55 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04D0ItcW043163; Wed, 13 May 2020 00:18:55 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04D0It8P043161; Wed, 13 May 2020 00:18:55 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <202005130018.04D0It8P043161@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Wed, 13 May 2020 00:18:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r535075 - in head/devel/ga: . files X-SVN-Group: ports-head X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: in head/devel/ga: . files X-SVN-Commit-Revision: 535075 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 May 2020 00:18:56 -0000 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 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 +