CVS commit: pkgsrc/lang

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Thu Jan 27 21:33:42 UTC 2022

Modified Files:
        pkgsrc/lang/python310: Makefile
        pkgsrc/lang/python37: Makefile
        pkgsrc/lang/python38: Makefile
        pkgsrc/lang/python39: Makefile

Log Message:
According to the noted issue, the compiler to avoid is llvm-gcc-4.2,
which means 11.x and 12.x according to mk/platform/Darwin.mk. On 10.x
(i386 Snow Leopard Server, at least), no problem with the system gcc.
Adjust the scope of the workaround to match.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/lang/python310/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/lang/python37/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/lang/python38/Makefile
cvs rdiff -u -r1.17 -r1.18 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/python310/Makefile
diff -u pkgsrc/lang/python310/Makefile:1.10 pkgsrc/lang/python310/Makefile:1.11
--- pkgsrc/lang/python310/Makefile:1.10 Tue Jan 25 12:16:54 2022
+++ pkgsrc/lang/python310/Makefile      Thu Jan 27 21:33:41 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2022/01/25 12:16:54 jperkin Exp $
+# $NetBSD: Makefile,v 1.11 2022/01/27 21:33:41 schmonz Exp $
 
 .include "dist.mk"
 
@@ -37,7 +37,7 @@ PTHREAD_OPTS+=        require
 .include "../../mk/bsd.prefs.mk"
 
 # http://bugs.python.org/issue13241
-.if !empty(MACHINE_PLATFORM:MDarwin-10.*)
+.if !empty(MACHINE_PLATFORM:MDarwin-1[12].*)
 PKGSRC_COMPILER=       clang
 PKG_CC=                        clang
 PKG_CXX=               clang++

Index: pkgsrc/lang/python37/Makefile
diff -u pkgsrc/lang/python37/Makefile:1.32 pkgsrc/lang/python37/Makefile:1.33
--- pkgsrc/lang/python37/Makefile:1.32  Tue Jan 25 12:16:54 2022
+++ pkgsrc/lang/python37/Makefile       Thu Jan 27 21:33:42 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2022/01/25 12:16:54 jperkin Exp $
+# $NetBSD: Makefile,v 1.33 2022/01/27 21:33:42 schmonz Exp $
 
 PKGREVISION= 3
 .include "dist.mk"
@@ -37,7 +37,7 @@ PTHREAD_OPTS+=        require
 .include "../../mk/bsd.prefs.mk"
 
 # http://bugs.python.org/issue13241
-.if !empty(MACHINE_PLATFORM:MDarwin-10.*)
+.if !empty(MACHINE_PLATFORM:MDarwin-1[12].*)
 PKGSRC_COMPILER?=      clang
 PKG_CC=                        clang
 PKG_CXX=               clang++

Index: pkgsrc/lang/python38/Makefile
diff -u pkgsrc/lang/python38/Makefile:1.26 pkgsrc/lang/python38/Makefile:1.27
--- pkgsrc/lang/python38/Makefile:1.26  Tue Jan 25 12:16:54 2022
+++ pkgsrc/lang/python38/Makefile       Thu Jan 27 21:33:42 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2022/01/25 12:16:54 jperkin Exp $
+# $NetBSD: Makefile,v 1.27 2022/01/27 21:33:42 schmonz Exp $
 
 PKGREVISION= 3
 .include "dist.mk"
@@ -38,7 +38,7 @@ PTHREAD_OPTS+=        require
 .include "../../mk/bsd.prefs.mk"
 
 # http://bugs.python.org/issue13241
-.if !empty(MACHINE_PLATFORM:MDarwin-10.*)
+.if !empty(MACHINE_PLATFORM:MDarwin-1[12].*)
 PKGSRC_COMPILER=       clang
 PKG_CC=                        clang
 PKG_CXX=               clang++

Index: pkgsrc/lang/python39/Makefile
diff -u pkgsrc/lang/python39/Makefile:1.17 pkgsrc/lang/python39/Makefile:1.18
--- pkgsrc/lang/python39/Makefile:1.17  Tue Jan 25 12:16:54 2022
+++ pkgsrc/lang/python39/Makefile       Thu Jan 27 21:33:42 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2022/01/25 12:16:54 jperkin Exp $
+# $NetBSD: Makefile,v 1.18 2022/01/27 21:33:42 schmonz Exp $
 
 .include "dist.mk"
 
@@ -37,7 +37,7 @@ PTHREAD_OPTS+=        require
 .include "../../mk/bsd.prefs.mk"
 
 # http://bugs.python.org/issue13241
-.if !empty(MACHINE_PLATFORM:MDarwin-10.*)
+.if !empty(MACHINE_PLATFORM:MDarwin-1[12].*)
 PKGSRC_COMPILER=       clang
 PKG_CC=                        clang
 PKG_CXX=               clang++