From nobody Sun Apr 10 15:42:50 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 3D3C61A8655F; Sun, 10 Apr 2022 15:42:51 +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 4Kbx8C1DQ5z3lCT; Sun, 10 Apr 2022 15:42:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649605371; 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=Hp44ueNrtBxjBA7yGtpNOc+L6doLaNgGXRv6IHqrAso=; b=TrIIwUuZwBPACEkcnKrrKWbhZP+q7PxBf9Jy3K4gGoq5IkE4qdlvMr4mUrB50ztjGF469a +gHB3/q0MSDaY10uUzdyAdkp/zIONhQ62HgJLvp70y2UONoAGz7/KLnH4T0ia1uJnLRC30 x6P5xQah+NNfeIgqs8Lh+67uVX3a9KrNgrDqBukMRgyOitExb2A+YlIhrSw9bGwwMBywR+ mxlHHW414JAvKwx+2AcvttUCCuRarloMynSlRfEiS2zUoBOSVHEDD0Ggxq2eXBTDLCWxOc E00miSEjModC3lZacTTLo+javliU2Tk7UO/81IQuIW5/0JRCWUo8+s3ybOrmmA== 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 00C231171E; Sun, 10 Apr 2022 15:42:51 +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 23AFgojk045330; Sun, 10 Apr 2022 15:42:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23AFgo9x045329; Sun, 10 Apr 2022 15:42:50 GMT (envelope-from git) Date: Sun, 10 Apr 2022 15:42:50 GMT Message-Id: <202204101542.23AFgo9x045329@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Adriaan de Groot Subject: git: 731a0cba8469 - main - devel/cmake: prefer python3 over versioned python3.x 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: adridg X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 731a0cba8469ce33d4406f735afac00f6914e158 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649605371; 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=Hp44ueNrtBxjBA7yGtpNOc+L6doLaNgGXRv6IHqrAso=; b=m+/HAYw5+SioRQUHNzZToT8HUkT/M+f+6ozXHZhbo2eXfTPgGdJCZsSkBMzS8LTNMa03Ki TxTM6juXSaN0A/wHWVgjFnU84fs+FPPt6xm832NdPtm8enYRFvhp8VPzXgwLhjlA11Vf9d sGoz2cYINZU8KA+y8C2bov/xBvrWCgScrjQrepplDUq/Mz1sRoStNj/8yMZpDG0ujNlUBu 1013lK2iDWpDdvu3M/2eDezQLq6GaqV8Jf8cA3fGk8jezRynGklISXw1aU7JV+Cur4F24U Ncwem444NkWDOwlvTauQmaeDmfLoXn1tI6wLNyhk1MbSeYxj+11o+w0uqOF7OA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649605371; a=rsa-sha256; cv=none; b=Iz4pzGlZuNRN0Jtnoe7s3x4tKSfwZj6xMVxe15sknU15wA7GKww+DCqVtSJSodIMtTPFjr PJzUGFV/KC7Yi6tjnkh/B5av0hOUH3QsdEjCSpMZbLSMZlY04MOJiKHlBspW2Yh5Z6sh2r Di0T+AebEwnp14EIyoV8kKSwB9+C0dOwu8nmVWVgGxhT3sRG6q4m2bSB1fAqS4ci89+I0v aFtwmQPjGCplsL1FnWhz5mRDb5dgYVy+Cy+LzJ0k8RRJOgpQIYLSSj1rBh807MZWz3yupc xLjTeh5foUFauN/zK262m/lI5DyTUtgFjcKZ3IxZQd1E1KmSH0VIQaoDVZHlGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by adridg: URL: https://cgit.FreeBSD.org/ports/commit/?id=731a0cba8469ce33d4406f735afac00f6914e158 commit 731a0cba8469ce33d4406f735afac00f6914e158 Author: Adriaan de Groot AuthorDate: 2022-04-10 15:34:55 +0000 Commit: Adriaan de Groot CommitDate: 2022-04-10 15:34:55 +0000 devel/cmake: prefer python3 over versioned python3.x Depending on which mechanism is used to find Python (Python3 in particular, since there's only one Python2 version left), either python3 is found -- installed by the python3 metaport, and presumed to be the "preferred / default Python3 version" -- of a versioned python3. Asking for, say, Python 3.6 will get you whatever python3 points at -- assuming it is newer than 3.6 -- or, with the other mechanism, the newest python (e.g. highest installed version). Those are not necessarily the same. Switch the new mechanism to preferring python3; there's a knob in CMake itself for that, we just need to set it in the FreeBSD config-file. PR: 252277 --- devel/cmake/Makefile | 1 + devel/cmake/files/patch-Modules_Platform_FreeBSD.cmake | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile index 69095886dc8d..476f5a689af4 100644 --- a/devel/cmake/Makefile +++ b/devel/cmake/Makefile @@ -3,6 +3,7 @@ PORTNAME= cmake # Remember to update devel/cmake-doc and devel/cmake-gui as well. DISTVERSION= 3.22.2 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= https://github.com/Kitware/CMake/releases/download/v${DISTVERSION}/ \ https://www.cmake.org/files/v${PORTVERSION}/ diff --git a/devel/cmake/files/patch-Modules_Platform_FreeBSD.cmake b/devel/cmake/files/patch-Modules_Platform_FreeBSD.cmake new file mode 100644 index 000000000000..a34d8d0de404 --- /dev/null +++ b/devel/cmake/files/patch-Modules_Platform_FreeBSD.cmake @@ -0,0 +1,12 @@ +--- Modules/Platform/FreeBSD.cmake.orig 2022-04-10 15:22:59 UTC ++++ Modules/Platform/FreeBSD.cmake +@@ -26,4 +26,9 @@ foreach(type SHARED_LIBRARY SHARED_MODULE EXE) + set(CMAKE_${type}_LINK_DYNAMIC_C_FLAGS "-Wl,-Bdynamic") + endforeach() + ++# Prefer python3 (installed by the python3 metaport) over the ++# highest-versioned Python3 interpreter, when asked for a non-exact ++# Python3 version. ++set(Python3_FIND_UNVERSIONED_NAMES FIRST) ++ + include(Platform/UnixPaths)