CVS commit: pkgsrc/lang

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

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Tue Jun 27 10:29:58 UTC 2023

Modified Files:
        pkgsrc/lang/python310: Makefile
        pkgsrc/lang/python311: Makefile
        pkgsrc/lang/python39: Makefile

Log Message:
lang/python39, 310, 311: Handle TOOLBASE/LOCALBASE split.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/lang/python310/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/python311/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/lang/python39/Makefile

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

Modified files:

Index: pkgsrc/lang/python310/Makefile
diff -u pkgsrc/lang/python310/Makefile:1.16 pkgsrc/lang/python310/Makefile:1.17
--- pkgsrc/lang/python310/Makefile:1.16 Tue Sep  6 19:13:24 2022
+++ pkgsrc/lang/python310/Makefile      Tue Jun 27 10:29:58 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2022/09/06 19:13:24 adam Exp $
+# $NetBSD: Makefile,v 1.17 2023/06/27 10:29:58 riastradh Exp $
 
 .include "dist.mk"
 
@@ -36,11 +36,10 @@ PTHREAD_OPTS+=      require
 
 .include "../../mk/bsd.prefs.mk"
 
-.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
+.if ${USE_CROSS_COMPILE:U:tl} == "yes"
 TOOL_DEPENDS+=         ${PKGNAME}:../../${PKGPATH}
 # XXX copied from ../../lang/python/pyversion.mk to avoid including it
-# XXX should use NATIVE_PREFIX but we don't have that
-CONFIGURE_ARGS+=       PYTHON_FOR_BUILD=${PREFIX}/bin/python3.10
+CONFIGURE_ARGS+=       PYTHON_FOR_BUILD=${TOOLBASE:Q}/bin/python3.10
 CONFIGURE_ARGS+=       MACHDEP=${PY_PLATNAME}
 CONFIGURE_ARGS+=       \
        _PYTHON_HOST_PLATFORM=${LOWER_OPSYS}-${MACHINE_GNU_ARCH}

Index: pkgsrc/lang/python311/Makefile
diff -u pkgsrc/lang/python311/Makefile:1.5 pkgsrc/lang/python311/Makefile:1.6
--- pkgsrc/lang/python311/Makefile:1.5  Thu Jun 22 11:16:06 2023
+++ pkgsrc/lang/python311/Makefile      Tue Jun 27 10:29:58 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2023/06/22 11:16:06 jperkin Exp $
+# $NetBSD: Makefile,v 1.6 2023/06/27 10:29:58 riastradh Exp $
 
 .include "dist.mk"
 
@@ -40,8 +40,7 @@ PTHREAD_OPTS+=        require
 .if ${USE_CROSS_COMPILE:U:tl} == yes
 TOOL_DEPENDS+=         ${PKGNAME}:../../${PKGPATH}
 # XXX copied from ../../lang/python/pyversion.mk to avoid including it
-# XXX should use NATIVE_PREFIX but we don't have that
-CONFIGURE_ARGS+=       PYTHON_FOR_BUILD=${PREFIX}/bin/python3.11
+CONFIGURE_ARGS+=       PYTHON_FOR_BUILD=${TOOLBASE:Q}/bin/python3.11
 CONFIGURE_ARGS+=       MACHDEP=${PY_PLATNAME}
 CONFIGURE_ARGS+=       \
        _PYTHON_HOST_PLATFORM=${LOWER_OPSYS}-${MACHINE_GNU_ARCH}

Index: pkgsrc/lang/python39/Makefile
diff -u pkgsrc/lang/python39/Makefile:1.22 pkgsrc/lang/python39/Makefile:1.23
--- pkgsrc/lang/python39/Makefile:1.22  Wed Sep  7 15:33:19 2022
+++ pkgsrc/lang/python39/Makefile       Tue Jun 27 10:29:58 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2022/09/07 15:33:19 adam Exp $
+# $NetBSD: Makefile,v 1.23 2023/06/27 10:29:58 riastradh Exp $
 
 .include "dist.mk"
 
@@ -36,11 +36,10 @@ PTHREAD_OPTS+=      require
 
 .include "../../mk/bsd.prefs.mk"
 
-.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
+.if ${USE_CROSS_COMPILE:U:tl} == "yes"
 TOOL_DEPENDS+=         ${PKGNAME}:../../${PKGPATH}
 # XXX copied from ../../lang/python/pyversion.mk to avoid including it
-# XXX should use NATIVE_PREFIX but we don't have that
-CONFIGURE_ARGS+=       PYTHON_FOR_BUILD=${PREFIX:Q}/bin/python3.9
+CONFIGURE_ARGS+=       PYTHON_FOR_BUILD=${TOOLBASE:Q}/bin/python3.9
 CONFIGURE_ARGS+=       MACHDEP=${PY_PLATNAME}
 CONFIGURE_ARGS+=       \
        _PYTHON_HOST_PLATFORM=${LOWER_OPSYS}-${MACHINE_GNU_ARCH}