CVS commit: pkgsrc/lang/python313

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

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Mon Oct 21 10:21:27 UTC 2024

Modified Files:
        pkgsrc/lang/python313: distinfo
        pkgsrc/lang/python313/patches: patch-Include_pymacro.h

Log Message:
python313: Extend NetBSD "fix" to SunOS too.

It's somewhat odd that this is being seen on all pkgsrc platforms, e.g. here
on Linux too:

  https://us-central.manta.mnx.io/pkgsrc/public/reports/Linux/el9/trunk/x86_64/20241019.1600/python313-3.13.0/build.log

This suggests we are doing something actively harmful somewhere else in our
package as there's no way upstream would ship a broken python 3.13 on Linux,
but I don't have time to debug that right now, nor test the "fix" on Linux.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/python313/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/lang/python313/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/python313/distinfo
diff -u pkgsrc/lang/python313/distinfo:1.1 pkgsrc/lang/python313/distinfo:1.2
--- pkgsrc/lang/python313/distinfo:1.1  Wed Oct  9 19:53:19 2024
+++ pkgsrc/lang/python313/distinfo      Mon Oct 21 10:21:27 2024
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.1 2024/10/09 19:53:19 adam Exp $
+$NetBSD: distinfo,v 1.2 2024/10/21 10:21:27 jperkin Exp $
 
 BLAKE2s (Python-3.13.0.tar.xz) = 6b3f073530d7771b9a6454047f6b42628293257dfee51811ef67462280fe8485
 SHA512 (Python-3.13.0.tar.xz) = 44a143c9b96b55b01885ec020c3364265bda55289615cd7d5071915b0d0178a6f35e7551a89090001fcb7f3172d38177a56bf8b8532b15c9dbc50295c9210152
 Size (Python-3.13.0.tar.xz) = 22532980 bytes
-SHA1 (patch-Include_pymacro.h) = f4435e90694e41fac7a9ab13096c43581910ba62
+SHA1 (patch-Include_pymacro.h) = b8fed85d0cd15e5ff62936fb2ad2aac028b0c982
 SHA1 (patch-Lib_ctypes_util.py) = 3dec1b6b7a36e46cbfa0dfcd71c5e7fac9f60764
 SHA1 (patch-Lib_sysconfig_____init____.py) = 6c151d3dca0367cbb38c1175b9dba894509cf1a4
 SHA1 (patch-Makefile.pre.in) = 744bccba4b582c8a6c8de5e1177c6912d6128718

Index: pkgsrc/lang/python313/patches/patch-Include_pymacro.h
diff -u pkgsrc/lang/python313/patches/patch-Include_pymacro.h:1.1 pkgsrc/lang/python313/patches/patch-Include_pymacro.h:1.2
--- pkgsrc/lang/python313/patches/patch-Include_pymacro.h:1.1   Wed Oct  9 19:53:19 2024
+++ pkgsrc/lang/python313/patches/patch-Include_pymacro.h       Mon Oct 21 10:21:27 2024
@@ -1,4 +1,4 @@
-$NetBSD: patch-Include_pymacro.h,v 1.1 2024/10/09 19:53:19 adam Exp $
+$NetBSD: patch-Include_pymacro.h,v 1.2 2024/10/21 10:21:27 jperkin Exp $
 
 Fix build on NetBSD: error: initializer element is not constant.
 
@@ -9,7 +9,7 @@ Fix build on NetBSD: error: initializer 
  
  #if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L \
 -     && !defined(__cplusplus))
-+     && !defined(__cplusplus) && !defined(__NetBSD__))
++     && !defined(__cplusplus) && !defined(__NetBSD__) && !defined(__sun))
  #  define Py_BUILD_ASSERT_EXPR(cond) \
      ((void)sizeof(struct { int dummy; _Static_assert(cond, #cond); }), \
       0)