CVS commit: pkgsrc/lang

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

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Tue Jan  7 19:34:41 UTC 2025

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

Log Message:
lang/python3*: Use PY_VER_SUFFIX instead of copying & pasting it.

Change is limited to cross-builds.

No change to generated package; CONFIGURE_ARGS should be unchanged by
this.


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 pkgsrc/lang/python310/Makefile
cvs rdiff -u -r1.36 -r1.37 pkgsrc/lang/python311/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/lang/python312/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/lang/python313/Makefile
cvs rdiff -u -r1.42 -r1.43 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.38 pkgsrc/lang/python310/Makefile:1.39
--- pkgsrc/lang/python310/Makefile:1.38 Thu Dec  5 07:50:40 2024
+++ pkgsrc/lang/python310/Makefile      Tue Jan  7 19:34:41 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2024/12/05 07:50:40 adam Exp $
+# $NetBSD: Makefile,v 1.39 2025/01/07 19:34:41 riastradh Exp $
 
 .include "dist.mk"
 
@@ -57,7 +57,8 @@ PTHREAD_OPTS+=        require
 
 .if ${USE_CROSS_COMPILE:U:tl} == "yes"
 TOOL_DEPENDS+=         ${PKGNAME}:../../${PKGPATH}
-CONFIGURE_ARGS+=       PYTHON_FOR_BUILD=${TOOLBASE:Q}/bin/python3.10
+CONFIGURE_ARGS+=       \
+       PYTHON_FOR_BUILD=${TOOLBASE:Q}/bin/python${PY_VER_SUFFIX}
 CONFIGURE_ARGS+=       MACHDEP=${PY_PLATNAME}
 CONFIGURE_ARGS+=       ac_sys_system=${OPSYS}
 .  if ${OPSYS} == "OSF1"

Index: pkgsrc/lang/python311/Makefile
diff -u pkgsrc/lang/python311/Makefile:1.36 pkgsrc/lang/python311/Makefile:1.37
--- pkgsrc/lang/python311/Makefile:1.36 Fri Dec  6 06:19:12 2024
+++ pkgsrc/lang/python311/Makefile      Tue Jan  7 19:34:41 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2024/12/06 06:19:12 riastradh Exp $
+# $NetBSD: Makefile,v 1.37 2025/01/07 19:34:41 riastradh Exp $
 
 PKGREVISION=   1
 .include "dist.mk"
@@ -60,7 +60,8 @@ FAKE_NCURSES=         yes
 
 .if ${USE_CROSS_COMPILE:U:tl} == yes
 TOOL_DEPENDS+=         ${PKGNAME}:../../${PKGPATH}
-CONFIGURE_ARGS+=       --with-build-python=${TOOLBASE:Q}/bin/python3.11
+CONFIGURE_ARGS+=       \
+       --with-build-python=${TOOLBASE:Q}/bin/python${PY_VER_SUFFIX}
 CONFIGURE_ARGS+=       MACHDEP=${PY_PLATNAME}
 CONFIGURE_ARGS+=       \
        _PYTHON_HOST_PLATFORM=${LOWER_OPSYS}-${MACHINE_GNU_ARCH}

Index: pkgsrc/lang/python312/Makefile
diff -u pkgsrc/lang/python312/Makefile:1.24 pkgsrc/lang/python312/Makefile:1.25
--- pkgsrc/lang/python312/Makefile:1.24 Tue Dec 24 10:13:40 2024
+++ pkgsrc/lang/python312/Makefile      Tue Jan  7 19:34:41 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2024/12/24 10:13:40 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2025/01/07 19:34:41 riastradh Exp $
 
 PKGREVISION=   2
 .include "dist.mk"
@@ -69,7 +69,8 @@ FAKE_NCURSES=         yes
 
 .if ${USE_CROSS_COMPILE:U:tl} == yes
 TOOL_DEPENDS+=         ${PKGNAME}:../../${PKGPATH}
-CONFIGURE_ARGS+=       --with-build-python=${TOOLBASE:Q}/bin/python3.12
+CONFIGURE_ARGS+=       \
+       --with-build-python=${TOOLBASE:Q}/bin/python${PY_VER_SUFFIX}
 CONFIGURE_ARGS+=       MACHDEP=${PY_PLATNAME}
 CONFIGURE_ARGS+=       \
        _PYTHON_HOST_PLATFORM=${LOWER_OPSYS}-${MACHINE_GNU_ARCH}

Index: pkgsrc/lang/python313/Makefile
diff -u pkgsrc/lang/python313/Makefile:1.13 pkgsrc/lang/python313/Makefile:1.14
--- pkgsrc/lang/python313/Makefile:1.13 Sun Jan  5 11:18:28 2025
+++ pkgsrc/lang/python313/Makefile      Tue Jan  7 19:34:41 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2025/01/05 11:18:28 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2025/01/07 19:34:41 riastradh Exp $
 
 PKGREVISION=   3
 .include "dist.mk"
@@ -62,7 +62,8 @@ FAKE_NCURSES=         yes
 
 .if ${USE_CROSS_COMPILE:U:tl} == yes
 TOOL_DEPENDS+=         ${PKGNAME}:../../${PKGPATH}
-CONFIGURE_ARGS+=       --with-build-python=${TOOLBASE:Q}/bin/python3.13
+CONFIGURE_ARGS+=       \
+       --with-build-python=${TOOLBASE:Q}/bin/python${PY_VER_SUFFIX}
 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.42 pkgsrc/lang/python39/Makefile:1.43
--- pkgsrc/lang/python39/Makefile:1.42  Thu Dec  5 07:49:52 2024
+++ pkgsrc/lang/python39/Makefile       Tue Jan  7 19:34:41 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2024/12/05 07:49:52 adam Exp $
+# $NetBSD: Makefile,v 1.43 2025/01/07 19:34:41 riastradh Exp $
 
 .include "dist.mk"
 
@@ -56,7 +56,8 @@ PTHREAD_OPTS+=        require
 
 .if ${USE_CROSS_COMPILE:U:tl} == "yes"
 TOOL_DEPENDS+=         ${PKGNAME}:../../${PKGPATH}
-CONFIGURE_ARGS+=       PYTHON_FOR_BUILD=${TOOLBASE:Q}/bin/python3.9
+CONFIGURE_ARGS+=       \
+       PYTHON_FOR_BUILD=${TOOLBASE:Q}/bin/python${PY_VER_SUFFIX}
 CONFIGURE_ARGS+=       MACHDEP=${PY_PLATNAME}
 CONFIGURE_ARGS+=       ac_sys_system=${OPSYS}
 .  if ${OPSYS} == "OSF1"