CVS commit: pkgsrc/lang/python

["Taylor R Campbell" <riastradh%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Thu Jan 23 19:31:43 UTC 2025

Modified Files:
        pkgsrc/lang/python: wheel.mk

Log Message:
lang/python/wheel.mk: Support cross-builds with py-installer.

This relies on our patch to py-installer for the `--executable'
option.  The newer dependency is limited to cross-building.

No change to native builds intended -- the extra arguments passed are
empty for native builds.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/lang/python/wheel.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/python/wheel.mk
diff -u pkgsrc/lang/python/wheel.mk:1.16 pkgsrc/lang/python/wheel.mk:1.17
--- pkgsrc/lang/python/wheel.mk:1.16    Thu Jan 16 23:21:51 2025
+++ pkgsrc/lang/python/wheel.mk Thu Jan 23 19:31:43 2025
@@ -1,4 +1,4 @@
-# $NetBSD: wheel.mk,v 1.16 2025/01/16 23:21:51 gutteridge Exp $
+# $NetBSD: wheel.mk,v 1.17 2025/01/23 19:31:43 riastradh Exp $
 #
 # Build and install Python wheels
 #
@@ -40,6 +40,8 @@ WHEEL_ARGS?=  # empty
 
 PRINT_PLIST_AWK+=      { gsub(/${_WHEEL_INFODIR:S,.,\.,g}/, "$${WHEEL_INFODIR}") }
 
+.include "../../mk/bsd.fast.prefs.mk"
+
 .if !target(do-build)
 TOOL_DEPENDS+= ${PYPKGPREFIX}-build>=0:../../devel/py-build
 do-build:
@@ -49,11 +51,21 @@ do-build:
 .endif
 
 .if !target(do-install)
-TOOL_DEPENDS+= ${PYPKGPREFIX}-installer>=0.7.0nb1:../../misc/py-installer
+.  if ${USE_CROSS_COMPILE:tl} == "yes"
+TOOL_DEPENDS+= ${PYPKGPREFIX}-installer>=0.7.0nb2:../../misc/py-installer
+PYINSTALL_EXEC=        --executable ${PYTHONBIN:Q}
+.  else
+TOOL_DEPENDS+= ${PYPKGPREFIX}-installer>=0.7.0nb1:../../misc/py-installer
+PYINSTALL_EXEC=        # empty
+.  endif
 do-install:
        ${RUN} cd ${WRKSRC}/${PYSETUPSUBDIR} && \
        ${SETENV} ${INSTALL_ENV} ${TOOL_PYTHONBIN} \
-               -m installer --destdir ${DESTDIR:Q} --prefix ${PREFIX:Q} ${WHEELFILE}
+               -m installer \
+               --destdir ${DESTDIR:Q} \
+               --prefix ${PREFIX:Q} \
+               ${PYINSTALL_EXEC} \
+               ${WHEELFILE}
 .endif
 
 USE_PYTEST?=   yes