From nobody Thu Oct 19 07:10:41 2023 X-Original-To: dev-commits-ports-all@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 4S9zQ94JbKz4y4pT; Thu, 19 Oct 2023 07:10:41 +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 4S9zQ93bLwz3HZ0; Thu, 19 Oct 2023 07:10:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697699441; 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=ws+dl0cl/wK39qidExBZ/BMzk2+uBnL6ukasqv3u9PM=; b=SkcJdjicNKZFcAGB0wyRWGdLDw42mAT8jt2zqQFaYIRzCDPTgVxvWXMmFai8Qn8ToxKlGP wSgi4HBc73YC/p+02ETUC4Peqjwi0NC4d2x7WKEOC4VCieeRr4Gkr6BZydqAmB1GcmHPDg rjdYb57yTSVVGVONHRJ/9zd4QPQ/qDtyfFLf5XjKaQrMuyN6Nkd8jKKt2uDbGo/X5MS7EG vmIPqrev3Olqh/Q6NlL+wt3Zs16WiTD5ARjjuvCGAxMvpfwceiYzHs9jRYWl0mfdfJiqiI ocHfvS3+DUGS9ySdJWIa+9XtEh4M4Mgudo+JStQaz998CG+eqlU67wxPDPGg7Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697699441; a=rsa-sha256; cv=none; b=bWgOOsfTHo5sPUdhLaRPUkF6ocvolMgNrS0OcdxTzIUbsLjZ0yiZ6W1gaMYYXOfElsFKIY x4HY76peYawHIGeGc4vT5MXSerovoXk71ewcCI8SorD+vHnR4sP2zQXsgxsxRaBz3euiY1 z1pZ0wdXrivXcrhjsrQ85cujVmtMaiIigKRqfuOTXnx4qZV3GzT2wxDBfhcFqg9toTB2On BxpIMMXFPp4Qdyu1fmU7IX+UX41xMQ6BvRJ/IlvepBnw4kZOV3E9KgD7YL3XhC5PtvGfni 7RGX3L1phP+DZKBltTj0DWT95Sl9Jo9ffSYENM3RWF/tfH4E6+vLMIgfpPKJCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697699441; 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=ws+dl0cl/wK39qidExBZ/BMzk2+uBnL6ukasqv3u9PM=; b=c08W5u2gLQxyFs3aILFUXpOFaGbFAhz0ykdj3Z2jXisxLg6gDWIXNjClxbbPKeh7pu/y2X 2dYmLEPO9TckjEj3YEEJTp5UZq6pfvolDtYoKFzKwcNsGxNy+LoubSa/IGnBcimg/Qy5Q3 tatALLOJwtAionqOvPCsz69aLgoOWJAejgGOSow0azZWY66qz9AGC+/bk6Pkq4xNb2kNTs QWP4FFcCRRrSKR/lDumfwEBd+Iyaij69Z3zg9DWveJeJHj/pChmkPO9yVU8OygXk6HAjQV j4l9vnbNvHNBQaYKRwLnMbIoy9A4Gd8uknmoEJCc+FkMLIFJw1sLgCjrvrlApw== 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 4S9zQ92FNxzfg6; Thu, 19 Oct 2023 07:10:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39J7AfBQ059595; Thu, 19 Oct 2023 07:10:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39J7AfwG059592; Thu, 19 Oct 2023 07:10:41 GMT (envelope-from git) Date: Thu, 19 Oct 2023 07:10:41 GMT Message-Id: <202310190710.39J7AfwG059592@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Robert Clausecker Subject: git: 85eb4b630618 - 2023Q4 - science/py-pymol: fix build on targets without OpenMP List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q4 X-Git-Reftype: branch X-Git-Commit: 85eb4b63061891705c18255babd076a102cdc621 Auto-Submitted: auto-generated The branch 2023Q4 has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=85eb4b63061891705c18255babd076a102cdc621 commit 85eb4b63061891705c18255babd076a102cdc621 Author: Robert Clausecker AuthorDate: 2023-10-18 19:17:09 +0000 Commit: Robert Clausecker CommitDate: 2023-10-19 07:10:09 +0000 science/py-pymol: fix build on targets without OpenMP armv7 still doesn't have it, so disable OpenMP there to make the port build. The previous problem from PR 262208 seems to no longer occur. Approved by: portmgr (build fix blanket) MFH: 2023Q4 (cherry picked from commit c07e560b22f7edc7d26098be318af3c415311c9a) --- science/py-pymol/Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/science/py-pymol/Makefile b/science/py-pymol/Makefile index ae9365af177c..b31b04de6cb9 100644 --- a/science/py-pymol/Makefile +++ b/science/py-pymol/Makefile @@ -39,6 +39,11 @@ CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}chempy # chempy port is unrelated, see CXXFLAGS+= -DMSGPACK_NO_BOOST # in line with MSGPACK_USE_BOOST=OFF in devel/msgpack-cxx +.if !exists(/usr/include/omp.h) +PYDISTUTILS_CONFIGUREARGS+= --use-openmp=no +PYDISTUTILS_BUILDARGS+= --use-openmp=no +.endif + OPTIONS_SINGLE= GUI OPTIONS_SINGLE_GUI= QT5 TK OPTIONS_DEFAULT= QT5