Bug 273713 - devel/llvm15: remove [now] unnecessary python cmake args
Summary: devel/llvm15: remove [now] unnecessary python cmake args
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Many People
Assignee: Brooks Davis
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2023-09-11 01:55 UTC by John Hein
Modified: 2023-09-19 23:01 UTC (History)
1 user (show)

See Also:
bugzilla: maintainer-feedback? (brooks)


Attachments
[patch] remove cmake Python3_EXECUTABLE definition - now in Mk/Uses/python.mk (3.23 KB, patch)
2023-09-11 01:55 UTC, John Hein
jcfyecrayz: maintainer-approval? (brooks)
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description John Hein 2023-09-11 01:55:57 UTC
Created attachment 244761 [details]
[patch] remove cmake Python3_EXECUTABLE definition - now in Mk/Uses/python.mk

CMAKE_ARGS+=-DPython3_EXECUTABLE=<...> is no longer needed in devel/llvm15 (and llvm11, llvm12, etc.).

See bug 262109, comment 23.  It is now defined in Mk/Uses/python.mk.

PORTREVISION bump not needed.
Comment 1 John Hein 2023-09-11 02:29:42 UTC
Also I think -DPYTHON_EXECUTABLE is not needed in devel/llvm-devel.  PYTHON_EXECUTABLE is _set_ by FindPythonInterp.cmake (which is the older version of the builtin cmake python support modules).  PYTHON_EXECUTABLE is _not_ an input for FindPythonInterp.cmake.

The PYTHON_EXECUTABLE spelling is not used at all in the newer python support modules - FindPython{,2,3}.cmake (as input or output).

Thus removal of the PYTHON_EXECUTABLE is not directly related to the change committed due to bug 262109 - but I think it can be removed safely - removing the PYTHON_EXECUTABLE setting in llvm-devel/Makefile certainly works fine here (in poudriere and out) even when PREFIX and LOCALBASE are not set to default values.  I didn't include the removal for llvm-devel/Makefile in the attached patch.  Committing removal of that is merely tangentially related to the topic of cleanup of CMAKE_ARGS - it is not a change that comes due to the changes in python.mk
Comment 2 commit-hook freebsd_committer freebsd_triage 2023-09-13 15:44:01 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=ef25b4bbd15686236014276ef6792fb7f8c9a279

commit ef25b4bbd15686236014276ef6792fb7f8c9a279
Author:     John Hein <jcfyecrayz@liamekaens.com>
AuthorDate: 2023-09-12 18:18:19 +0000
Commit:     Brooks Davis <brooks@FreeBSD.org>
CommitDate: 2023-09-13 15:42:51 +0000

    devel/llvm-devel: don't set cmake PYTHON_EXECUTABLE

    The PYTHON_EXECUTABLE spelling is not used at all in the newer python
    support modules - FindPython{,2,3}.cmake and the framework now sets the
    correct values.

    PR:             273713

 devel/llvm-devel/Makefile | 1 -
 1 file changed, 1 deletion(-)
Comment 3 commit-hook freebsd_committer freebsd_triage 2023-09-13 15:44:02 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=7076fade2f473ec6a6bdf3a0620ead5dccd2ea96

commit 7076fade2f473ec6a6bdf3a0620ead5dccd2ea96
Author:     John Hein <jcfyecrayz@liamekaens.com>
AuthorDate: 2023-09-12 18:14:17 +0000
Commit:     Brooks Davis <brooks@FreeBSD.org>
CommitDate: 2023-09-13 15:42:51 +0000

    devel/llvm1*: remove cmake 4Python3_EXECUTABLE definition

    It is now defined in Mk/Uses/python.mk.

    PR:             273713

 devel/llvm11/Makefile | 1 -
 devel/llvm12/Makefile | 1 -
 devel/llvm13/Makefile | 1 -
 devel/llvm14/Makefile | 1 -
 devel/llvm15/Makefile | 1 -
 devel/llvm16/Makefile | 1 -
 devel/llvm17/Makefile | 1 -
 7 files changed, 7 deletions(-)
Comment 4 Brooks Davis freebsd_committer freebsd_triage 2023-09-13 15:52:09 UTC
Thanks! I've updated the various llvm ports. Given these seem to be nops I don't plan to merge to quarterly unless doing so eases another merge.

I can't close this due to the dependency on 262109 which I think is the wrong way around.
Comment 5 John Hein 2023-09-19 23:01:42 UTC
Closing this after Brook's commit - ports 7076fade2f473ec6a6bdf3a0620ead5dccd2ea96.  Thanks.

This change was dependent on the commit from bug 262109 - ports aa9736e3e5f6856f5eb5e26837169b0f6022eec8.  But then bug 262109 turned into a meta-bug.  That probably should have been closed and the followup cleanups been a news separate (meta) bug.

I also removed the dependency here on bug 262109 even though it does depend on the patch that was applied by that bug.  Bugzilla doesn't allow closing this bug while the 'depends on' bug is still open.  This comment will have to serve as documentation of that dependency.