From nobody Mon Sep 04 17:22:01 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 4Rfb6K2xD2z4sV8V; Mon, 4 Sep 2023 17:22:01 +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 4Rfb6K2T9Jz4YDj; Mon, 4 Sep 2023 17:22:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693848121; 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=bXpPwOzLp6aG7B90u1LCJbZjH2u3QDDiv7kWSu2kzPM=; b=cHl3UAo/fgIwQEtoB74oZkVtqL4v5E5dh+UevujXlxu+EggvxjscrCn4ZBZ9s9UU4cFrSM 59mq3zGCd5Hd4CDMIcH/eiSzfMqBMjhoW7rHzPkf+DanbxKvU0uTEA/VdQyj3y4zgsbqi6 QJq5Y/wKBdMQhx1oSTGlxntd+2jIu6YIsx48QXxqMdm6Iuz6CKjmAQYV44rzp+KkLebtiG XUlk6MnkTKlEiqrD8xW7N/HjhGD0ntbYMy4jDE4EDIclB1HT439IVHvHgIdVWMF+IYJywQ iIYMZYeQNqHLa6jL/6gIZQTAj7ZQBbCpS/pQiBonI+Yff85i2CikyAbdWuBE7Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693848121; a=rsa-sha256; cv=none; b=Bc8En1cbL8lpDzo8GbfsKnVIpnVqiVkK2t43TTkTGZcc/6fNr9BudXcliSNszzTcwM6d2Q w0XWqWjYb23GfV9doZ+mWreGkJ9NItq5foVVf4lCNb34n6wwE5VoHTe/Tml9SGvZqMWdD2 GT9TnRRgCAwAkg2P1OgTzH/7v6a6zD5NdlZkJhpSk310Tyk0tAxdsu1f8ubCSfKZ4tfJUz 1y6+vvUzekB92KSwK813MJfA6EiMf7hULIgNM2hPijDYQIL5A28s2F+6Gb/ps41BADT4Tx mXkUy4LmtjK4LJ3MEkWdP4h3Rp1CwFtIUK30cdNG7gPp0CXVpdtyGyPPd/+qDQ== 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=1693848121; 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=bXpPwOzLp6aG7B90u1LCJbZjH2u3QDDiv7kWSu2kzPM=; b=GX+LzUifjYZiYsS3OZTHRhl2l4BwPTh4Xar0CcS31JnHnjFwnvAFMqtp6RgqvZP0xzpLTq W5/GT6CQ3EnPIs+6nqPqpjhn/0GVSA1hQtq92sCobxkAjmdAGyLFmbUTbkpJhDOG23AqcW oLiDeA5Fru9PInmNG8+XwEEoWTiNiUsXS7CVejMnIw7gTZA3OJeIijwttbQLLdhYzZg084 TdEJnz6bEtJZYPd84cvgpOIs2pxA7TGPPJy8iwtDViaLj6hT26RorQdK6wZQeRIAKemN2w GxdVa5x1VLXmPC1+xU1QXC3YV5CGzMfry3uRcn0rGPRs2mQ+etcd3MW2aQXoRg== 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 4Rfb6K1YMZz1FGb; Mon, 4 Sep 2023 17:22:01 +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 384HM1AF077646; Mon, 4 Sep 2023 17:22:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 384HM1ut077643; Mon, 4 Sep 2023 17:22:01 GMT (envelope-from git) Date: Mon, 4 Sep 2023 17:22:01 GMT Message-Id: <202309041722.384HM1ut077643@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Li-Wen Hsu Subject: git: aa9736e3e5f6 - main - python.mk: Improve CMake/Python integration 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: lwhsu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aa9736e3e5f6856f5eb5e26837169b0f6022eec8 Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/ports/commit/?id=aa9736e3e5f6856f5eb5e26837169b0f6022eec8 commit aa9736e3e5f6856f5eb5e26837169b0f6022eec8 Author: John Hein AuthorDate: 2023-09-04 16:23:06 +0000 Commit: Li-Wen Hsu CommitDate: 2023-09-04 17:21:35 +0000 python.mk: Improve CMake/Python integration Suport FindPython.cmake, FindPython3.cmake, FindPython2.cmake modules by adding Python{,2,3}_EXECUTABLE to CMAKE_ARGS in python.mk. CMake supports more than one way to search for python. Currently python.mk passes -DPython_ADDITIONAL_VERSIONS=${PYTHON_VER} to help FindPython{Interp,Libs}.cmake modules "find" the version of python that a port build wants to use. The FindPython{,2,3}.cmake modules don't know anything about Python_ADDITIONAL_VERSIONS but use Python{,2,3}_EXECUTABLE as the hint. PR: 262109 --- Mk/Uses/python.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Mk/Uses/python.mk b/Mk/Uses/python.mk index 179cdd2c1d0a..1665683f0827 100644 --- a/Mk/Uses/python.mk +++ b/Mk/Uses/python.mk @@ -771,6 +771,8 @@ CONFIGURE_ENV+= PYTHON="${PYTHON_CMD}" # By default CMake picks up the highest available version of Python package. # Enforce the version required by the port or the default. CMAKE_ARGS+= -DPython_ADDITIONAL_VERSIONS=${PYTHON_VER} +CMAKE_ARGS+= -DPython_EXECUTABLE:FILEPATH="${PYTHON_CMD}" +CMAKE_ARGS+= -DPython${PYTHON_MAJOR_VER}_EXECUTABLE:FILEPATH="${PYTHON_CMD}" # Python 3rd-party modules PYGAME= ${PYTHON_PKGNAMEPREFIX}game>0:devel/py-game@${PY_FLAVOR}