From nobody Tue Jul 12 19:20:27 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 23C991D0BAA3; Tue, 12 Jul 2022 19:20:28 +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 4Lj9ZN0Y45z3t01; Tue, 12 Jul 2022 19:20:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657653628; 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=GvZY8A5oX7X1XrVFTeLuW2IIH75a/Q7IYDHyPHvEKtE=; b=e6NpRbcuhhNMDt2N7WYujNGhyFm6LXSkfE1gcrwjDcBw1s96aBl+LzuIaAQSK5yYeurAu6 chh2wu0st4ZQ+2yGuuEVnoM27oz50Wyz0oNz2Zyu4TgQQFnqmhc8cV7xnRR81De+qGVERw xT49uW6Oi2v77LJcDynPylO0ee4uLrrDK7LF0ymKXIUKjNLyEjtZqb2Yl2ZEd/So0xVhE0 m9k6EObE/OleAhOmU0ScbmfQ+Sm1vBVuxbPw3/bzyY8rzVJxzmjBbmzwiRp8KLbZT4xN74 b/j6OR5pmv5zEexXt9c8Gkm9gTmgGSXoBRhDW6N3PsF1DampY3uzTti6xsryeg== 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 4Lj9ZM6kvPzvZw; Tue, 12 Jul 2022 19:20:27 +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 26CJKRks011019; Tue, 12 Jul 2022 19:20:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26CJKRPJ011018; Tue, 12 Jul 2022 19:20:27 GMT (envelope-from git) Date: Tue, 12 Jul 2022 19:20:27 GMT Message-Id: <202207121920.26CJKRPJ011018@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Andree Subject: git: d443494a71b7 - main - math/Imath: ensure PYTHON build with /usr/bin/python[3] links 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: mandree X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d443494a71b73dc543cc0eddec69a01d6280ce02 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657653628; 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=GvZY8A5oX7X1XrVFTeLuW2IIH75a/Q7IYDHyPHvEKtE=; b=ByHmiLlOJ0axzHj3uPEKDjCKZtrsK27i1DBOIazckFyvuLGDUs0lPc0wgX8kHXZ5J8O4ZY JOY5MqM1bXaIW+lnVqDQcROBOmnJJHkmfZ6+jRP7CWNoMyq5PEdjNTt7Ef6pvnEkUV0B+F yoJ/XlM49IkUzHSmesfMVaX+rNkpfe/aQcxq5nw9K6gZZmmaIrissz0N6Lre7eh2k+Bk0I 94MXvNjr27UCAreVJJk4rOEOUjautNyriZggmIkKC/0lv6PgqAZr9E+q/kwe6spHN+2do4 Gmx0xcCuD16LVVxgh4yS2JWwhu3OIyxzHfhi315tOWyxyVipz2DhMyWlo6qk7w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657653628; a=rsa-sha256; cv=none; b=GC1+hHcEw6TRSN6hZYPHCc0nJgjupzXUc8ZbBj58Tp5Q1paYwNZzj+9btqQKqAaCOe/OOR WTDIjgDXNhOLechJvrV3uyvRk3oV7Wm0t8XOKbfi2rkLcrby73khT7EQnRrsS46mB0X05A cwfFLMyVQVH4mvasv6v3Dw/qRuN3JB15EvjUbhWv/eovgyZ/8nc5UF1OqODV+fTordOl4C iDsRkzbICilS29nbtUJ1ZIKsfpk/fHQ9cFsaLGzPupSViZoFBtQAAc92i76yBjmq7RUxB5 9yN15CcOsfQBnLFHJiip74oczBI74u66dRrjevMeOpb4oGVOE0oPFOzi9nAVUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=d443494a71b73dc543cc0eddec69a01d6280ce02 commit d443494a71b73dc543cc0eddec69a01d6280ce02 Author: Matthias Andree AuthorDate: 2022-07-12 19:06:08 +0000 Commit: Matthias Andree CommitDate: 2022-07-12 19:20:13 +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 --- 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: