CVS commit: pkgsrc/lang

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/lang
From: "Taylor R Campbell" <riastradh%netbsd.org@localhost>
Date: Tue, 7 Jan 2025 19:35:09 +0000

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Tue Jan  7 19:35:09 UTC 2025

Modified Files:
        pkgsrc/lang/python: egg.mk extension.mk pyversion.mk srcdist.mk
        pkgsrc/lang/python310: Makefile
        pkgsrc/lang/python311: Makefile
        pkgsrc/lang/python312: Makefile
        pkgsrc/lang/python313: Makefile
        pkgsrc/lang/python39: Makefile

Log Message:
lang/python*: No need for :U with USE_CROSS_COMPILE.

After including bsd.prefs.mk or bsd.fast.prefs.mk, this is guaranteed
to be defined.  If it isn't, there's a bug (like misspelling it),
which we should flag early rather than quietly suppress.


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 pkgsrc/lang/python/egg.mk
cvs rdiff -u -r1.65 -r1.66 pkgsrc/lang/python/extension.mk
cvs rdiff -u -r1.166 -r1.167 pkgsrc/lang/python/pyversion.mk
cvs rdiff -u -r1.43 -r1.44 pkgsrc/lang/python/srcdist.mk
cvs rdiff -u -r1.39 -r1.40 pkgsrc/lang/python310/Makefile
cvs rdiff -u -r1.37 -r1.38 pkgsrc/lang/python311/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/lang/python312/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/lang/python313/Makefile
cvs rdiff -u -r1.43 -r1.44 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/python/egg.mk
diff -u pkgsrc/lang/python/egg.mk:1.44 pkgsrc/lang/python/egg.mk:1.45
--- pkgsrc/lang/python/egg.mk:1.44      Tue Sep 17 16:57:10 2024
+++ pkgsrc/lang/python/egg.mk   Tue Jan  7 19:35:08 2025
@@ -1,4 +1,4 @@
-# $NetBSD: egg.mk,v 1.44 2024/09/17 16:57:10 wiz Exp $
+# $NetBSD: egg.mk,v 1.45 2025/01/07 19:35:08 riastradh Exp $
 #
 # The method used in this Makefile fragment is obsolete.
 # Please use wheel.mk instead.
@@ -65,7 +65,7 @@ DEPENDS+=     ${PYPKGPREFIX}-setuptools-[0-9
 TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:${SETUPTOOLS_PATH}
 .endif
 
-.if ${USE_CROSS_COMPILE:U:tl} == "yes"
+.if ${USE_CROSS_COMPILE:tl} == "yes"
 .if ${PYTHON_FOR_BUILD_ONLY:Uno:tl} == "no" || \
     ${PYTHON_FOR_BUILD_ONLY:Uno:tl} == "build"
 _COOKIE.pysetupcross=  ${WRKDIR}/.pysetupcross_done

Index: pkgsrc/lang/python/extension.mk
diff -u pkgsrc/lang/python/extension.mk:1.65 pkgsrc/lang/python/extension.mk:1.66
--- pkgsrc/lang/python/extension.mk:1.65        Sun Oct 29 17:07:15 2023
+++ pkgsrc/lang/python/extension.mk     Tue Jan  7 19:35:08 2025
@@ -1,4 +1,4 @@
-# $NetBSD: extension.mk,v 1.65 2023/10/29 17:07:15 wiz Exp $
+# $NetBSD: extension.mk,v 1.66 2025/01/07 19:35:08 riastradh Exp $
 
 .include "../../lang/python/pyversion.mk"
 
@@ -22,7 +22,7 @@ PYSETUPBUILDARGS?=    # empty
 PYSETUPBUILDARGS+=     -j${MAKE_JOBS}
 .    endif
 .  endif
-.  if ${USE_CROSS_COMPILE:U:tl} == "yes"
+.  if ${USE_CROSS_COMPILE:tl} == "yes"
 PYSETUPBUILDARGS+=     --executable=${PYTHONBIN:Q}
 .  endif
 PYSETUPARGS?=          # empty

Index: pkgsrc/lang/python/pyversion.mk
diff -u pkgsrc/lang/python/pyversion.mk:1.166 pkgsrc/lang/python/pyversion.mk:1.167
--- pkgsrc/lang/python/pyversion.mk:1.166       Wed Oct  9 20:00:28 2024
+++ pkgsrc/lang/python/pyversion.mk     Tue Jan  7 19:35:08 2025
@@ -1,4 +1,4 @@
-# $NetBSD: pyversion.mk,v 1.166 2024/10/09 20:00:28 adam Exp $
+# $NetBSD: pyversion.mk,v 1.167 2025/01/07 19:35:08 riastradh Exp $
 
 # This file should be included by packages as a way to depend on
 # python when none of the other methods are appropriate, e.g. a
@@ -206,7 +206,7 @@ TEST_DEPENDS+=                      ${PYDEPENDENCY}
 BUILDLINK_DEPMETHOD.python?=   build
 .    endif
 .    include "${PYPKGSRCDIR}/buildlink3.mk"
-.    if ${USE_CROSS_COMPILE:U:tl} == "yes"
+.    if ${USE_CROSS_COMPILE:tl} == "yes"
 TOOL_DEPENDS+=                 ${PYDEPENDENCY}
 MAKE_ENV+=                     PYTHONPATH=${WRKDIR:Q}/.pysite:${_CROSS_DESTDIR:Q}${LOCALBASE:Q}/${PYLIB:Q}
 pre-configure: ${WRKDIR}/.pysite/sitecustomize.py

Index: pkgsrc/lang/python/srcdist.mk
diff -u pkgsrc/lang/python/srcdist.mk:1.43 pkgsrc/lang/python/srcdist.mk:1.44
--- pkgsrc/lang/python/srcdist.mk:1.43  Tue Jun 27 10:31:21 2023
+++ pkgsrc/lang/python/srcdist.mk       Tue Jan  7 19:35:08 2025
@@ -1,4 +1,4 @@
-# $NetBSD: srcdist.mk,v 1.43 2023/06/27 10:31:21 riastradh Exp $
+# $NetBSD: srcdist.mk,v 1.44 2025/01/07 19:35:08 riastradh Exp $
 
 .include "../../lang/python/pyversion.mk"
 
@@ -17,7 +17,7 @@ BUILDLINK_ABI_DEPENDS.${PYPACKAGE}+=  ${P
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${USE_CROSS_COMPILE:U:tl} == "yes"
+.if ${USE_CROSS_COMPILE:tl} == "yes"
 TOOL_DEPENDS+= ${PYDEPENDENCY}
 DEPENDS+=      ${PYDEPENDENCY}
 ALL_ENV+=      _PYTHON_PROJECT_BASE=${WRKSRC:Q}

Index: pkgsrc/lang/python310/Makefile
diff -u pkgsrc/lang/python310/Makefile:1.39 pkgsrc/lang/python310/Makefile:1.40
--- pkgsrc/lang/python310/Makefile:1.39 Tue Jan  7 19:34:41 2025
+++ pkgsrc/lang/python310/Makefile      Tue Jan  7 19:35:08 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2025/01/07 19:34:41 riastradh Exp $
+# $NetBSD: Makefile,v 1.40 2025/01/07 19:35:08 riastradh Exp $
 
 .include "dist.mk"
 
@@ -55,7 +55,7 @@ PTHREAD_OPTS+=        require
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${USE_CROSS_COMPILE:U:tl} == "yes"
+.if ${USE_CROSS_COMPILE:tl} == "yes"
 TOOL_DEPENDS+=         ${PKGNAME}:../../${PKGPATH}
 CONFIGURE_ARGS+=       \
        PYTHON_FOR_BUILD=${TOOLBASE:Q}/bin/python${PY_VER_SUFFIX}

Index: pkgsrc/lang/python311/Makefile
diff -u pkgsrc/lang/python311/Makefile:1.37 pkgsrc/lang/python311/Makefile:1.38
--- pkgsrc/lang/python311/Makefile:1.37 Tue Jan  7 19:34:41 2025
+++ pkgsrc/lang/python311/Makefile      Tue Jan  7 19:35:08 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2025/01/07 19:34:41 riastradh Exp $
+# $NetBSD: Makefile,v 1.38 2025/01/07 19:35:08 riastradh Exp $
 
 PKGREVISION=   1
 .include "dist.mk"
@@ -58,7 +58,7 @@ USE_CURSES=           getsyx wide
 FAKE_NCURSES=          yes
 .endif
 
-.if ${USE_CROSS_COMPILE:U:tl} == yes
+.if ${USE_CROSS_COMPILE:tl} == yes
 TOOL_DEPENDS+=         ${PKGNAME}:../../${PKGPATH}
 CONFIGURE_ARGS+=       \
        --with-build-python=${TOOLBASE:Q}/bin/python${PY_VER_SUFFIX}

Index: pkgsrc/lang/python312/Makefile
diff -u pkgsrc/lang/python312/Makefile:1.25 pkgsrc/lang/python312/Makefile:1.26
--- pkgsrc/lang/python312/Makefile:1.25 Tue Jan  7 19:34:41 2025
+++ pkgsrc/lang/python312/Makefile      Tue Jan  7 19:35:08 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2025/01/07 19:34:41 riastradh Exp $
+# $NetBSD: Makefile,v 1.26 2025/01/07 19:35:08 riastradh Exp $
 
 PKGREVISION=   2
 .include "dist.mk"
@@ -67,7 +67,7 @@ USE_CURSES=           getsyx update_panels wide
 FAKE_NCURSES=          yes
 .endif
 
-.if ${USE_CROSS_COMPILE:U:tl} == yes
+.if ${USE_CROSS_COMPILE:tl} == yes
 TOOL_DEPENDS+=         ${PKGNAME}:../../${PKGPATH}
 CONFIGURE_ARGS+=       \
        --with-build-python=${TOOLBASE:Q}/bin/python${PY_VER_SUFFIX}

Index: pkgsrc/lang/python313/Makefile
diff -u pkgsrc/lang/python313/Makefile:1.14 pkgsrc/lang/python313/Makefile:1.15
--- pkgsrc/lang/python313/Makefile:1.14 Tue Jan  7 19:34:41 2025
+++ pkgsrc/lang/python313/Makefile      Tue Jan  7 19:35:09 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2025/01/07 19:34:41 riastradh Exp $
+# $NetBSD: Makefile,v 1.15 2025/01/07 19:35:09 riastradh Exp $
 
 PKGREVISION=   3
 .include "dist.mk"
@@ -60,7 +60,7 @@ USE_CURSES=           getsyx update_panels wide
 FAKE_NCURSES=          yes
 .endif
 
-.if ${USE_CROSS_COMPILE:U:tl} == yes
+.if ${USE_CROSS_COMPILE:tl} == yes
 TOOL_DEPENDS+=         ${PKGNAME}:../../${PKGPATH}
 CONFIGURE_ARGS+=       \
        --with-build-python=${TOOLBASE:Q}/bin/python${PY_VER_SUFFIX}

Index: pkgsrc/lang/python39/Makefile
diff -u pkgsrc/lang/python39/Makefile:1.43 pkgsrc/lang/python39/Makefile:1.44
--- pkgsrc/lang/python39/Makefile:1.43  Tue Jan  7 19:34:41 2025
+++ pkgsrc/lang/python39/Makefile       Tue Jan  7 19:35:09 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2025/01/07 19:34:41 riastradh Exp $
+# $NetBSD: Makefile,v 1.44 2025/01/07 19:35:09 riastradh Exp $
 
 .include "dist.mk"
 
@@ -54,7 +54,7 @@ PTHREAD_OPTS+=        require
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${USE_CROSS_COMPILE:U:tl} == "yes"
+.if ${USE_CROSS_COMPILE:tl} == "yes"
 TOOL_DEPENDS+=         ${PKGNAME}:../../${PKGPATH}
 CONFIGURE_ARGS+=       \
        PYTHON_FOR_BUILD=${TOOLBASE:Q}/bin/python${PY_VER_SUFFIX}

Prev by Date: CVS commit: pkgsrc/lang
Next by Date: CVS commit: pkgsrc/devel
Previous by Thread: CVS commit: pkgsrc/lang
Next by Thread: CVS commit: pkgsrc/devel
Indexes:

Home | Main Index | Thread Index | Old Index