From nobody Wed Apr 27 13:40:29 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id BB1461990EA2; Wed, 27 Apr 2022 13:40:32 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KpKdB1Hh3z4rhS; Wed, 27 Apr 2022 13:40:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651066830; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rYnLZo3CmIjxduxN/2tMk2EAx6BGioygw4dCwtpL3EI=; b=hQ/zjhX8OKqZnvEZQHjZmDNWfxdkqpKTurbzBED8tIyxDpPvkogYSa08qytI5xrtZ6D1yS YA9i3YRsk4sHJeozEdGbRT1cCQ6fEDt8frGpdZHkph4xas+lOv98msMfYVUww+vMPh9q65 rMqGJaPV32qQjwKOxKwAfM5RyUDHnKXup0th2f+/Bpl941weMZdDmBftLKDm1ir7p3c9Eu MJ15H8wwOYq+NvsW0Ru3GNq2LER5wcFjvPVpP7e2ipmCmCoJUwz/n3zIWB1AgQf7MwBtiJ PIcpAaJhVwHodigXl+L0MVEm3OFiB9hJjTNVLerlkPXBEQeUF80fPa+t0yyANQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A5A1F24E56; Wed, 27 Apr 2022 13:40:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23RDeTR0080236; Wed, 27 Apr 2022 13:40:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23RDeTsI080235; Wed, 27 Apr 2022 13:40:29 GMT (envelope-from git) Date: Wed, 27 Apr 2022 13:40:29 GMT Message-Id: <202204271340.23RDeTsI080235@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: ccbaef928e39 - main - science/nest: check for omp.h on all architectures List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ccbaef928e39056825d63efcba5dc850f5154a18 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651066830; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rYnLZo3CmIjxduxN/2tMk2EAx6BGioygw4dCwtpL3EI=; b=kVV6k5HU+7NfX6RWnCPHK4FBm6SwaHaQTCdBI++5j5qogtW3ltox1VKsJPLB8IgnUJoubV MfTdFSI0e0MguhdwjdWtmq2cwSwZMNwUGDsExt89YkuulEwCCh6jc7ikh/1Twefj/a0uti II8rYlaLdhIy5Kal1mGl175bZ/MVqvTKYFYPDP21SKKyufcUmLJ0L/MKbIV4YV+hGvn4wo GyAtvIJIZeQ+t6YlqJXKwaO5fl+n3d/6u9xjtPrySh/uGQiSwVZl6X4IJ/TniP3SWl9k9p X3qDyhIO0ObKkDaQYzO4tXUciu16yOxah6yGLJR7Lqw3qitgWzeDYXLQpMVNNg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651066830; a=rsa-sha256; cv=none; b=Kybh0LXY4jfCmvcLec6X7Ccac7P3DNuqxhKr6DdM1oj8xnAYDRTdrsNYmTByaz773XHuYp vRlu9DDJu31I8RJ9DC9USVK/utYg1XdjDVLs8vr1bBiG0K6eYa5hRcsBMQauCdYMwOqFFk b2VQefa4EtcHBQVkmjPf1x7ZO8oZOY5vygXd3mph1UILdWq+p+y7uM2TPwwgAW1AwCrm4L N9rjQTkDOeqVn7lvw5qZ1svf7jVkeYmW59K9z8XesfLSLHL8GUkzEQN34gF/W1QE5xzXLA AjaOI19Lkluhy59Cu9TNAbeL0Ok3OXR4pgDLH4hr5G+Ume4HxIzv1VcZrE3gjA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=ccbaef928e39056825d63efcba5dc850f5154a18 commit ccbaef928e39056825d63efcba5dc850f5154a18 Author: Piotr Kubaj AuthorDate: 2022-04-27 13:22:20 +0000 Commit: Piotr Kubaj CommitDate: 2022-04-27 13:22:20 +0000 science/nest: check for omp.h on all architectures --- science/nest/Makefile | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/science/nest/Makefile b/science/nest/Makefile index 5c3f17e9cebf..13cc59729854 100644 --- a/science/nest/Makefile +++ b/science/nest/Makefile @@ -34,18 +34,16 @@ PYTHON_CMAKE_ON= -DFREEBSD_PYTHON_VER:STRING=${PYTHON_VER} -DCYTHON_EXECUTABLE:S PORTDOCS= * +.if !exists(/usr/include/omp.h) +USES+= compiler:gcc-c++11-lib +.else +USES+= compiler:c++11-lang +.endif + # 2 tests are known to fail, see https://github.com/nest/nest-simulator/issues/2190 # tests require the port to be installed with DOCS=ON, see https://github.com/nest/nest-simulator/issues/2191 post-install: @${REINPLACE_CMD} -i '' -e 's|^python3 |${PYTHON_CMD} |' ${STAGEDIR}${PREFIX}/share/nest/testsuite/do_tests.sh -.include - -.if ${ARCH} == powerpc -USES+= compiler:gcc-c++11-lib -.else -USES+= compiler:c++11-lang -.endif - .include