CVS commit: pkgsrc/lang/python311

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

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

Modified Files:
        pkgsrc/lang/python311: Makefile distinfo
        pkgsrc/lang/python311/patches: patch-configure

Log Message:
python311: Adjust to new configure interface for cross-compilation.

Restore patch to simplify sysconfigdata name in configure, now that
passing through this logic is mandatory for cross-compilation (at
least, mandatory without further patches to configure).


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/lang/python311/Makefile \
    pkgsrc/lang/python311/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/python311/patches/patch-configure

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

Modified files:

Index: pkgsrc/lang/python311/Makefile
diff -u pkgsrc/lang/python311/Makefile:1.7 pkgsrc/lang/python311/Makefile:1.8
--- pkgsrc/lang/python311/Makefile:1.7  Tue Jun 27 10:35:30 2023
+++ pkgsrc/lang/python311/Makefile      Thu Jun 29 01:32:28 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2023/06/27 10:35:30 riastradh Exp $
+# $NetBSD: Makefile,v 1.8 2023/06/29 01:32:28 riastradh Exp $
 
 .include "dist.mk"
 
@@ -39,8 +39,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
-CONFIGURE_ARGS+=       PYTHON_FOR_BUILD=${TOOLBASE:Q}/bin/python3.11
+CONFIGURE_ARGS+=       --with-build-python=${TOOLBASE:Q}/bin/python3.11
 CONFIGURE_ARGS+=       MACHDEP=${PY_PLATNAME}
 CONFIGURE_ARGS+=       \
        _PYTHON_HOST_PLATFORM=${LOWER_OPSYS}-${MACHINE_GNU_ARCH}
@@ -52,9 +51,6 @@ 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_HOST_PLATFORM=${LOWER_OPSYS}-${MACHINE_GNU_ARCH}
-MAKE_ENV+=             _PYTHON_PROJECT_BASE=${WRKSRC}
 .endif
 
 # http://bugs.python.org/issue13241
Index: pkgsrc/lang/python311/distinfo
diff -u pkgsrc/lang/python311/distinfo:1.7 pkgsrc/lang/python311/distinfo:1.8
--- pkgsrc/lang/python311/distinfo:1.7  Thu Jun 22 11:16:06 2023
+++ pkgsrc/lang/python311/distinfo      Thu Jun 29 01:32:28 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2023/06/22 11:16:06 jperkin Exp $
+$NetBSD: distinfo,v 1.8 2023/06/29 01:32:28 riastradh Exp $
 
 BLAKE2s (Python-3.11.4.tar.xz) = c18c396b72d794ede405921276aa43b1923a4bda964d7dcf797bded7e8e30b1b
 SHA512 (Python-3.11.4.tar.xz) = 7eb14fecbf60824d10c22a9057584c3a142c2866f4af6caa2525c10c8bcb24e6e7afb32a44a0e118df0a2b2543d578c3b422ffd4a5fa317dfe6ea371cc7ee1ee
@@ -10,5 +10,5 @@ SHA1 (patch-Lib_lib2to3_pgen2_driver.py)
 SHA1 (patch-Lib_sysconfig.py) = bc6d91bf8f7121456b26ea7f080f588c96f2596f
 SHA1 (patch-Makefile.pre.in) = 352633b0c261fb3feaec2e11ee3fdbabfe4bc0f4
 SHA1 (patch-Modules_socketmodule.c) = dcf93806374bb8d983b7c8cefd7a3360a90064d7
-SHA1 (patch-configure) = 6221cff9d7949c1d1d9ea434dd70a8e3e4e2bac6
+SHA1 (patch-configure) = 684a8e2405cd690958798a64cdbb8985ce03b023
 SHA1 (patch-setup.py) = e9d63094f547bd0a9e00d4ded88ebcdfeb3a7ea2

Index: pkgsrc/lang/python311/patches/patch-configure
diff -u pkgsrc/lang/python311/patches/patch-configure:1.3 pkgsrc/lang/python311/patches/patch-configure:1.4
--- pkgsrc/lang/python311/patches/patch-configure:1.3   Wed Jun  7 13:28:49 2023
+++ pkgsrc/lang/python311/patches/patch-configure       Thu Jun 29 01:32:28 2023
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.3 2023/06/07 13:28:49 adam Exp $
+$NetBSD: patch-configure,v 1.4 2023/06/29 01:32:28 riastradh Exp $
 
 Fix linking on Darwin; don't use -stack_size.
 Changes for consistency across pkgsrc platforms.
@@ -7,6 +7,15 @@ Disable barrier to cross-compilation.
 
 --- configure.orig     2023-06-06 22:00:27.000000000 +0000
 +++ configure
+@@ -3630,7 +3630,7 @@ fi
+     fi
+         ac_cv_prog_PYTHON_FOR_REGEN=$with_build_python
+     PYTHON_FOR_FREEZE="$with_build_python"
+-    PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat 
pybuilddir.txt`:)$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH) '$with_build_python
++    PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat 
pybuilddir.txt`:)$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata_$(MACHDEP) '$with_build_python
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_build_python" >&5
+ printf "%s\n" "$with_build_python" >&6; }
+ 
 @@ -4253,7 +4253,7 @@ fi
  printf "%s\n" "\"$MACHDEP\"" >&6; }