From owner-svn-ports-all@freebsd.org Fri May 3 12:30:41 2019 Return-Path: Delivered-To: svn-ports-all@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 C0155158F0A3; Fri, 3 May 2019 12:30:41 +0000 (UTC) (envelope-from adamw@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 667566F2C8; Fri, 3 May 2019 12:30:41 +0000 (UTC) (envelope-from adamw@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 3F35E20ADC; Fri, 3 May 2019 12:30:41 +0000 (UTC) (envelope-from adamw@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x43CUfW4007453; Fri, 3 May 2019 12:30:41 GMT (envelope-from adamw@FreeBSD.org) Received: (from adamw@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x43CUfTq007452; Fri, 3 May 2019 12:30:41 GMT (envelope-from adamw@FreeBSD.org) Message-Id: <201905031230.x43CUfTq007452@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adamw set sender to adamw@FreeBSD.org using -f From: Adam Weinberger Date: Fri, 3 May 2019 12:30:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r500723 - head/science/ALPSCore X-SVN-Group: ports-head X-SVN-Commit-Author: adamw X-SVN-Commit-Paths: head/science/ALPSCore X-SVN-Commit-Revision: 500723 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 667566F2C8 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.96)[-0.960,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 May 2019 12:30:41 -0000 Author: adamw Date: Fri May 3 12:30:40 2019 New Revision: 500723 URL: https://svnweb.freebsd.org/changeset/ports/500723 Log: compiler.mk is unhappy if CC/CXX is defined before bsd.port.pre.mk Reported by: Peter Jeremy Submitted by: mat Modified: head/science/ALPSCore/Makefile Modified: head/science/ALPSCore/Makefile ============================================================================== --- head/science/ALPSCore/Makefile Fri May 3 11:50:24 2019 (r500722) +++ head/science/ALPSCore/Makefile Fri May 3 12:30:40 2019 (r500723) @@ -38,11 +38,16 @@ DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen OPENMPI2_CMAKE_BOOL= ENABLE_MPI OPENMPI2_LIB_DEPENDS= libmpi.so:net/openmpi2 -OPENMPI2_VARS= cc=${LOCALBASE}/mpi/openmpi2/bin/mpicc \ - cxx=${LOCALBASE}/mpi/openmpi2/bin/mpicxx PORTDOCS= * +.include + +.if ${PORT_OPTIONS:MOPENMP2} +CC= ${LOCALBASE}/mpi/openmpi2/bin/mpicc +CXX= ${LOCALBASE}/mpi/openmpi2/bin/mpicxx +.endif + post-install-DOXYGEN-on: @${RM} ${STAGEDIR}${DOCSDIR}/.tag @@ -51,4 +56,4 @@ pre-test: ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} ${CMAKE_ARGS_TEST} ${CMAKE_SOURCE_PATH} && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} -.include +.include