Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 3416184D2D for ; Thu, 29 Jun 2023 01:32:07 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id 4M4Mvougt_ag for ; Thu, 29 Jun 2023 01:32:06 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id A9BA984CED for ; Thu, 29 Jun 2023 01:32:06 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id A70B1FA89; Thu, 29 Jun 2023 01:32:06 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_168800232670720" MIME-Version: 1.0 Date: Thu, 29 Jun 2023 01:32:06 +0000 From: "Taylor R Campbell" Subject: CVS commit: pkgsrc/lang/python39 To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: riastradh@netbsd.org X-Mailer: log_accum Message-Id: <20230629013206.A70B1FA89@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_168800232670720 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: riastradh Date: Thu Jun 29 01:32:06 UTC 2023 Modified Files: pkgsrc/lang/python39: Makefile Log Message: python39: 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.24 -r1.25 pkgsrc/lang/python39/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_168800232670720 Content-Disposition: inline Content-Length: 1389 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/lang/python39/Makefile diff -u pkgsrc/lang/python39/Makefile:1.24 pkgsrc/lang/python39/Makefile:1.25 --- pkgsrc/lang/python39/Makefile:1.24 Tue Jun 27 10:35:30 2023 +++ pkgsrc/lang/python39/Makefile Thu Jun 29 01:32:06 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2023/06/27 10:35:30 riastradh Exp $ +# $NetBSD: Makefile,v 1.25 2023/06/29 01:32:06 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.9 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,9 +48,11 @@ 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+= \ +ALL_ENV+= _PYTHON_PROJECT_BASE=${WRKSRC:Q} +ALL_ENV+= \ _PYTHON_HOST_PLATFORM=${LOWER_OPSYS}-${MACHINE_GNU_ARCH} -MAKE_ENV+= _PYTHON_PROJECT_BASE=${WRKSRC:Q} +ALL_ENV+= \ + _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata_${PY_PLATNAME} .endif # http://bugs.python.org/issue13241 --_----------=_168800232670720--