From nobody Tue Jul 12 19:27:46 2022 X-Original-To: dev-commits-ports-branches@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 41BAA1D0CAEC; Tue, 12 Jul 2022 19:27:47 +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 4Lj9kq0bW7z3txj; Tue, 12 Jul 2022 19:27:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657654067; 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=EVHat0PdQWVbfJb/vG1pMtYlEy+mMBNkXTXo2Kq7RhU=; b=Bt7zEYMkty9m0FUZw0WR1POKienEnFxiYku+9HbfnKFKsS8GdeoFuYwuhDab3AmrStSkbe syJhmM10P0oeRiZybfSemcBwwIAAFwKbVmmbmlIQ0RdMTXSF3TV5IoTpFPLdb5szrenJEo VnoQFq6vjdhMfR59d+0aIF0BrvrJxASPwFcHKv16OGN3Z5uxqpwimeR7qYZtkeYuExqHEQ qrwsw/C7ZCQ9KjlH2105nCtoJS0G83zXLME6uJSpLcK3+Hj2agdWTYNbl3pLT4u0Tp92Og Zbte9eRfNba2TR5tJAjDqz7ksj5gjcxNfx/bCqsO7HNhR8OXXXwusgY/cw0wIQ== 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 4Lj9kp6fF4zvK3; Tue, 12 Jul 2022 19:27:46 +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 26CJRkEK015739; Tue, 12 Jul 2022 19:27:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26CJRkl6015738; Tue, 12 Jul 2022 19:27:46 GMT (envelope-from git) Date: Tue, 12 Jul 2022 19:27:46 GMT Message-Id: <202207121927.26CJRkl6015738@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Matthias Andree Subject: git: 50aed9b03a2c - 2022Q3 - math/Imath: ensure PYTHON build with /usr/bin/python[3] links List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mandree X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q3 X-Git-Reftype: branch X-Git-Commit: 50aed9b03a2ccb85c7a5f45866d914e97f2ef42d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657654067; 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=EVHat0PdQWVbfJb/vG1pMtYlEy+mMBNkXTXo2Kq7RhU=; b=nrNk+2qSLbf/B5rol4zU7dOJwcPCNWXSNtgE8Y1asChlDQ5zebOe9L6GPDM3+upblxC1eL 6TQzI1t0y6UZqSwFbykNOjMT1FK9628UPG5y7EPtiC6hiil3zIjHQI2FvpQ9W41PReH+9E QdwaeWkxJVmy/Vszy0GRTBZWEJ+AZcnIB9e2/JaGpB59CPzsNqBYEAWY9ijHSXSsDixzb5 e3aFU8Iuo0zx2Te7BlxktfDeSbjHCZxFH+V1c+2AAN1v4dWm9PAaCURUYa0BCJOqGy42Nu dIGPcZk5jJ6jYBBeRwsbg2PDJfqpSenH22mmjBa26Y9dc3QDKRRgyaml1xbWqw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657654067; a=rsa-sha256; cv=none; b=ewc6Kvx//9V00SWmhBWwqM3XXTxp6EVG9D9OBQmrrqgd33iO+yNyPdKQW7IGtvblM/0TEy lMWEa5uvawbjrQamOOV//tVLu3z7UDvgdgIOedSP5kOc2qRj3IDRtDykyuiPNW8y46WcsO au70o/RsZLtYKazBs9wwV9QknY4l2APY36LdBhVpNrpH2Hmb/m+ETGXq0c1B3Ki9mTo0B7 kb/NpL1y17t3wr/lKlWLn1neNiKxMpBvF4CFpJgTQngq049t2XGdCi0RBE7wAM69VDp6fu /t9X0YdyNs0gu4ojPkzi3RZnNSi0QB2Ve6CYCVVbTScb2/0Uq4+CZC2r69yUNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q3 has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=50aed9b03a2ccb85c7a5f45866d914e97f2ef42d commit 50aed9b03a2ccb85c7a5f45866d914e97f2ef42d Author: Matthias Andree AuthorDate: 2022-07-12 19:06:08 +0000 Commit: Matthias Andree CommitDate: 2022-07-12 19:20:52 +0000 math/Imath: ensure PYTHON build with /usr/bin/python[3] links When /usr/bin/python[3] symlinks are present (which is nonstandard), the FindPython logic inside cmake will grab it over $PREFIX/bin/python[3], but still identify (by default) /usr/local/lib/... as the sitelib path, but goof up when calculating the relative path in case of /usr/bin vs /usr/local/bin mismatch. Fix: Provide ${PYTHON_CMD} through the cmake Python_EXECUTABLE variable to avoid any ambiguities and pin the right executable. I believe it should be safe to NOT bump PORTREVISION, but I will fetch far and err on the safe side and bump it, because that is easier than researching all possible paths how and where Python paths might find their way into the resulting package. The detailed report by Seneca helped identify and solve this issue, so: Thanks to: Seneca Cunningham PR: 263341 Reported by: D'Arcy J.M. Cain Reported by: Seneca Cunningham MFH: 2022Q3 (cherry picked from commit d443494a71b73dc543cc0eddec69a01d6280ce02) --- math/Imath/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/math/Imath/Makefile b/math/Imath/Makefile index a8dfc492bc43..1e7ee781b089 100644 --- a/math/Imath/Makefile +++ b/math/Imath/Makefile @@ -2,6 +2,7 @@ PORTNAME= Imath PORTVERSION= 3.1.5 +PORTREVISION= 1 CATEGORIES= math devel graphics MAINTAINER= mandree@FreeBSD.org @@ -45,7 +46,7 @@ _MINVER= 4 _PLVER= 0 post-patch: - ${REINPLACE_CMD} -E 's/find_package\(Python(3?) COMPONENTS/find_package(Python\1 ${PYTHON_VER} EXACT COMPONENTS/' \ + ${REINPLACE_CMD} -E 's}find_package\(Python(3?) COMPONENTS}set(Python\1_EXECUTABLE ${PYTHON_CMD})\nfind_package(Python\1 ${PYTHON_VER} EXACT COMPONENTS}' \ ${WRKSRC}/src/python/CMakeLists.txt post-install: