CVS commit: pkgsrc/lang/python311

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

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Thu Jun 22 11:16:06 UTC 2023

Modified Files:
        pkgsrc/lang/python311: Makefile distinfo
Added Files:
        pkgsrc/lang/python311/patches: patch-Include_pymacro.h

Log Message:
python311: Do not define static_assert in C++ code.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/python311/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/lang/python311/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/lang/python311/patches/patch-Include_pymacro.h

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.4 pkgsrc/lang/python311/Makefile:1.5
--- pkgsrc/lang/python311/Makefile:1.4  Sat Jan 14 17:25:53 2023
+++ pkgsrc/lang/python311/Makefile      Thu Jun 22 11:16:06 2023
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2023/01/14 17:25:53 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2023/06/22 11:16:06 jperkin Exp $
 
 .include "dist.mk"
 
 PKGNAME=       python311-${PY_DISTVERSION}
+PKGREVISION=   1
 CATEGORIES=    lang python
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -58,7 +59,7 @@ MAKE_ENV+=            _PYTHON_PROJECT_BASE=${WRKSR
 .endif
 
 # http://bugs.python.org/issue13241
-.if !empty(MACHINE_PLATFORM:MDarwin-1[12].*)
+.if ${MACHINE_PLATFORM:MDarwin-1[12].*}
 PKGSRC_COMPILER=       clang
 PKG_CC=                        clang
 PKG_CXX=               clang++

Index: pkgsrc/lang/python311/distinfo
diff -u pkgsrc/lang/python311/distinfo:1.6 pkgsrc/lang/python311/distinfo:1.7
--- pkgsrc/lang/python311/distinfo:1.6  Wed Jun  7 13:28:49 2023
+++ pkgsrc/lang/python311/distinfo      Thu Jun 22 11:16:06 2023
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.6 2023/06/07 13:28:49 adam Exp $
+$NetBSD: distinfo,v 1.7 2023/06/22 11:16:06 jperkin Exp $
 
 BLAKE2s (Python-3.11.4.tar.xz) = c18c396b72d794ede405921276aa43b1923a4bda964d7dcf797bded7e8e30b1b
 SHA512 (Python-3.11.4.tar.xz) = 7eb14fecbf60824d10c22a9057584c3a142c2866f4af6caa2525c10c8bcb24e6e7afb32a44a0e118df0a2b2543d578c3b422ffd4a5fa317dfe6ea371cc7ee1ee
 Size (Python-3.11.4.tar.xz) = 19954828 bytes
+SHA1 (patch-Include_pymacro.h) = 271a891892dca1a3aaa3bedcae626a68a36cae0b
 SHA1 (patch-Lib_ctypes_util.py) = 3dec1b6b7a36e46cbfa0dfcd71c5e7fac9f60764
 SHA1 (patch-Lib_distutils_unixccompiler.py) = 8a91e8f4f86517a62408c3a10ed5eb50c4091fbf
 SHA1 (patch-Lib_lib2to3_pgen2_driver.py) = 593c4e93c5653ab400f0a98b91db92630c0a7390

Added files:

Index: pkgsrc/lang/python311/patches/patch-Include_pymacro.h
diff -u /dev/null pkgsrc/lang/python311/patches/patch-Include_pymacro.h:1.1
--- /dev/null   Thu Jun 22 11:16:06 2023
+++ pkgsrc/lang/python311/patches/patch-Include_pymacro.h       Thu Jun 22 11:16:06 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-Include_pymacro.h,v 1.1 2023/06/22 11:16:06 jperkin Exp $
+
+Do not define static_assert in C++ code.
+
+--- Include/pymacro.h.orig     2023-06-06 22:00:27.000000000 +0000
++++ Include/pymacro.h
+@@ -19,7 +19,7 @@
+ // not C++, and only for C11-17.
+ #if !defined(static_assert) && (defined(__GNUC__) || defined(__clang__)) \
+      && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L \
+-     && __STDC_VERSION__ <= 201710L
++     && __STDC_VERSION__ <= 201710L && !defined(__cplusplus)
+ #  define static_assert _Static_assert
+ #endif
+