CVS commit: pkgsrc/lang

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Wed Nov 29 11:02:41 UTC 2023

Modified Files:
        pkgsrc/lang/python27: buildlink3.mk
        pkgsrc/lang/python310: buildlink3.mk
        pkgsrc/lang/python311: buildlink3.mk
        pkgsrc/lang/python312: buildlink3.mk
        pkgsrc/lang/python38: buildlink3.mk
        pkgsrc/lang/python39: buildlink3.mk

Log Message:
python: Exclude dependencies for build.

When python bl3 files are included with PYTHON_FOR_BUILD_ONLY=yes, their
DEPMETHOD is set to "build", in which case we do not want to include
indirect dependencies as they will then be tagged as "build" also.  Fixes
potential runtime issues exposed by indirect dependency checks.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/lang/python27/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/python310/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/python311/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/python312/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/python38/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/python39/buildlink3.mk

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

Modified files:

Index: pkgsrc/lang/python27/buildlink3.mk
diff -u pkgsrc/lang/python27/buildlink3.mk:1.6 pkgsrc/lang/python27/buildlink3.mk:1.7
--- pkgsrc/lang/python27/buildlink3.mk:1.6      Fri Dec 30 10:53:21 2016
+++ pkgsrc/lang/python27/buildlink3.mk  Wed Nov 29 11:02:40 2023
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2016/12/30 10:53:21 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2023/11/29 11:02:40 jperkin Exp $
 
 BUILDLINK_TREE+=       python27
 
@@ -13,9 +13,12 @@ BUILDLINK_PKGSRCDIR.python27?=               ../../la
 BUILDLINK_DEPMETHOD.python27?= ${BUILDLINK_DEPMETHOD.python}
 .endif
 
+.if !${BUILDLINK_DEPMETHOD.python27:U:Mbuild}
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
+.endif
+
 .endif # PYTHON27_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -python27

Index: pkgsrc/lang/python310/buildlink3.mk
diff -u pkgsrc/lang/python310/buildlink3.mk:1.1 pkgsrc/lang/python310/buildlink3.mk:1.2
--- pkgsrc/lang/python310/buildlink3.mk:1.1     Tue Oct  5 19:07:13 2021
+++ pkgsrc/lang/python310/buildlink3.mk Wed Nov 29 11:02:41 2023
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2021/10/05 19:07:13 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2023/11/29 11:02:41 jperkin Exp $
 
 BUILDLINK_TREE+=       python310
 
@@ -16,9 +16,12 @@ BUILDLINK_INCDIRS.python310+=        include/py
 BUILDLINK_LIBDIRS.python310+=  lib/python3.10/config
 BUILDLINK_TRANSFORM+=          l:python:python3.10
 
+.if !${BUILDLINK_DEPMETHOD.python310:U:Mbuild}
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
+.endif
+
 .endif # PYTHON310_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -python310

Index: pkgsrc/lang/python311/buildlink3.mk
diff -u pkgsrc/lang/python311/buildlink3.mk:1.1 pkgsrc/lang/python311/buildlink3.mk:1.2
--- pkgsrc/lang/python311/buildlink3.mk:1.1     Mon Oct 31 09:52:13 2022
+++ pkgsrc/lang/python311/buildlink3.mk Wed Nov 29 11:02:41 2023
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2022/10/31 09:52:13 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2023/11/29 11:02:41 jperkin Exp $
 
 BUILDLINK_TREE+=       python311
 
@@ -16,9 +16,12 @@ BUILDLINK_INCDIRS.python311+=        include/py
 BUILDLINK_LIBDIRS.python311+=  lib/python3.11/config
 BUILDLINK_TRANSFORM+=          l:python:python3.11
 
+.if !${BUILDLINK_DEPMETHOD.python311:U:Mbuild}
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
+.endif
+
 .endif # PYTHON311_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -python311

Index: pkgsrc/lang/python312/buildlink3.mk
diff -u pkgsrc/lang/python312/buildlink3.mk:1.1 pkgsrc/lang/python312/buildlink3.mk:1.2
--- pkgsrc/lang/python312/buildlink3.mk:1.1     Mon Oct  2 20:07:14 2023
+++ pkgsrc/lang/python312/buildlink3.mk Wed Nov 29 11:02:41 2023
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2023/10/02 20:07:14 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2023/11/29 11:02:41 jperkin Exp $
 
 BUILDLINK_TREE+=       python312
 
@@ -16,9 +16,12 @@ BUILDLINK_INCDIRS.python312+=        include/py
 BUILDLINK_LIBDIRS.python312+=  lib/python3.12/config
 BUILDLINK_TRANSFORM+=          l:python:python3.12
 
+.if !${BUILDLINK_DEPMETHOD.python312:U:Mbuild}
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
+.endif
+
 .endif # PYTHON312_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -python312

Index: pkgsrc/lang/python38/buildlink3.mk
diff -u pkgsrc/lang/python38/buildlink3.mk:1.1 pkgsrc/lang/python38/buildlink3.mk:1.2
--- pkgsrc/lang/python38/buildlink3.mk:1.1      Tue Oct 15 16:51:19 2019
+++ pkgsrc/lang/python38/buildlink3.mk  Wed Nov 29 11:02:41 2023
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2019/10/15 16:51:19 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2023/11/29 11:02:41 jperkin Exp $
 
 BUILDLINK_TREE+=       python38
 
@@ -16,9 +16,12 @@ BUILDLINK_INCDIRS.python38+= include/pyt
 BUILDLINK_LIBDIRS.python38+=   lib/python3.8/config
 BUILDLINK_TRANSFORM+=          l:python:python3.8
 
+.if !${BUILDLINK_DEPMETHOD.python38:U:Mbuild}
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
+.endif
+
 .endif # PYTHON38_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -python38

Index: pkgsrc/lang/python39/buildlink3.mk
diff -u pkgsrc/lang/python39/buildlink3.mk:1.1 pkgsrc/lang/python39/buildlink3.mk:1.2
--- pkgsrc/lang/python39/buildlink3.mk:1.1      Sat Oct 10 20:19:47 2020
+++ pkgsrc/lang/python39/buildlink3.mk  Wed Nov 29 11:02:41 2023
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2020/10/10 20:19:47 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2023/11/29 11:02:41 jperkin Exp $
 
 BUILDLINK_TREE+=       python39
 
@@ -16,9 +16,12 @@ BUILDLINK_INCDIRS.python39+= include/pyt
 BUILDLINK_LIBDIRS.python39+=   lib/python3.9/config
 BUILDLINK_TRANSFORM+=          l:python:python3.9
 
+.if !${BUILDLINK_DEPMETHOD.python39:U:Mbuild}
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
+.endif
+
 .endif # PYTHON39_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -python39