From owner-svn-ports-head@freebsd.org Fri Sep 14 07:58:06 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5A5BB10A6D37; Fri, 14 Sep 2018 07:58:06 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 111277812C; Fri, 14 Sep 2018 07:58:06 +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 0C04B218D3; Fri, 14 Sep 2018 07:58:06 +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 w8E7w5I8093847; Fri, 14 Sep 2018 07:58:05 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w8E7w5D9093846; Fri, 14 Sep 2018 07:58:05 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <201809140758.w8E7w5D9093846@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Fri, 14 Sep 2018 07:58:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r479762 - head/science/cp2k X-SVN-Group: ports-head X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: head/science/cp2k X-SVN-Commit-Revision: 479762 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.27 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: Fri, 14 Sep 2018 07:58:06 -0000 Author: yuri Date: Fri Sep 14 07:58:05 2018 New Revision: 479762 URL: https://svnweb.freebsd.org/changeset/ports/479762 Log: science/cp2k: Require the option OPENMP=on in fftw3 for options OPENMP and OPENMP_MPI PR: 231163 Submitted by: jhale Modified: head/science/cp2k/Makefile Modified: head/science/cp2k/Makefile ============================================================================== --- head/science/cp2k/Makefile Fri Sep 14 07:44:45 2018 (r479761) +++ head/science/cp2k/Makefile Fri Sep 14 07:58:05 2018 (r479762) @@ -43,7 +43,6 @@ SERIAL_DESC= Single core (no multiprocessing) SERIAL_VARS= VERSION=sopt OPENMP_VARS= VERSION=ssmp -OPENMP_BROKEN= undefined reference to `dfftw_plan_with_nthreads_': https://github.com/cp2k/cp2k/issues/12 (need OPENMP=on in math/fftw3 ?) MPI_VARS= VERSION=popt MPI_LIB_DEPENDS= libmpich.so:net/mpich2 \ @@ -52,9 +51,19 @@ MPI_LIB_DEPENDS= libmpich.so:net/mpich2 \ OPENMP_MPI_DESC= Enable both OpenMP and MPI OPENMP_MPI_VARS= VERSION=psmp OPENMP_MPI_LIB_DEPENDS= ${MPI_LIB_DEPENDS} -OPENMP_MPI_BROKEN= ${OPENMP_BROKEN} PLIST_FILES= bin/${PORTNAME} + +.include + +.if ${PORT_OPTIONS:MOPENMP} || ${PORT_OPTIONS:MOPENMP_MPI} +pre-configure: + @if [ ! -e ${LOCALBASE}/lib/libfftw3_omp.so ] ; then \ + ${ECHO_MSG} "The OPENMP and OPENMP_MPI options require math/fftw3" ; \ + ${ECHO_MSG} "to be built and installed with the OPENMP option ON" ; \ + exit 1; \ + fi +.endif post-patch: @${REINPLACE_CMD} 's|LIBS.*=.*|& ${LDFLAGS}|; s|^FCFLAGS.*=.*|& -I${LOCALBASE}/include|' ${WRKSRC}/arch/FreeBSD-*