CVS commit: pkgsrc/lang/python310

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

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Thu Jun 29 01:32:17 UTC 2023

Modified Files:
        pkgsrc/lang/python310: Makefile

Log Message:
python310: Fix env vars for sysconfig data when cross-compiling.

Paves the way to cross-version-compiling (e.g., netbsd9 building
packages for netbsd10) and cross-OS-compilation (e.g., macOS building
packages for NetBSD).


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/lang/python310/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.18 pkgsrc/lang/python310/Makefile:1.19
--- pkgsrc/lang/python310/Makefile:1.18 Tue Jun 27 10:35:29 2023
+++ pkgsrc/lang/python310/Makefile      Thu Jun 29 01:32:17 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2023/06/27 10:35:29 riastradh Exp $
+# $NetBSD: Makefile,v 1.19 2023/06/29 01:32:17 riastradh Exp $
 
 .include "dist.mk"
 
@@ -38,11 +38,8 @@ 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
 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}
 CONFIGURE_ARGS+=       ac_sys_system=${OPSYS}
 .  if ${OPSYS} == "OSF1"
 CONFIGURE_ARGS+=       ac_cv_buggy_getaddrinfo=true
@@ -51,11 +48,12 @@ CONFIGURE_ARGS+=    ac_cv_buggy_getaddrinfo
 .  endif
 CONFIGURE_ARGS.NetBSD+=        ac_cv_file__dev_ptmx=yes
 CONFIGURE_ARGS.NetBSD+=        ac_cv_file__dev_ptc=no
-MAKE_ENV+=             \
-       _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata_${PY_PLATNAME:Q}
-MAKE_ENV+=             \
+ALL_ENV+=              \
        _PYTHON_HOST_PLATFORM=${LOWER_OPSYS}-${MACHINE_GNU_ARCH}
-MAKE_ENV+=             _PYTHON_PROJECT_BASE=${WRKSRC}
+ALL_ENV+=              \
+       _PYTHON_PROJECT_BASE=${WRKSRC:Q}
+ALL_ENV+=              \
+       _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata_${PY_PLATNAME:Q}
 .endif
 
 # http://bugs.python.org/issue13241