CVS commit: pkgsrc/lang/python313

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Fri Aug  8 11:03:30 UTC 2025

Modified Files:
        pkgsrc/lang/python313: Makefile PLIST distinfo
        pkgsrc/lang/python313/patches: patch-configure

Log Message:
lang/python313: Use libuuid to generate UUID on NetBSD and bump PKGREVISION

* Avoid use of uuid_create(3) of NetBSD and use devel/libuuid instead.
  test_uuid should not fail with UUID version mismatch.
* Do not define HAVE_UUID_H twice during configure (upstream problem).


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 pkgsrc/lang/python313/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/lang/python313/PLIST
cvs rdiff -u -r1.10 -r1.11 pkgsrc/lang/python313/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/python313/patches/patch-configure

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/Makefile
diff -u pkgsrc/lang/python313/Makefile:1.22 pkgsrc/lang/python313/Makefile:1.23
--- pkgsrc/lang/python313/Makefile:1.22 Thu Aug  7 14:23:18 2025
+++ pkgsrc/lang/python313/Makefile      Fri Aug  8 11:03:30 2025
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.22 2025/08/07 14:23:18 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2025/08/08 11:03:30 ryoon Exp $
 
 .include "dist.mk"
 
 PKGNAME=       python313-${PY_DISTVERSION}
+PKGREVISION=   1
 CATEGORIES=    lang python
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -52,16 +53,13 @@ PTHREAD_OPTS+=      require
 
 .include "../../mk/bsd.prefs.mk"
 
-PLIST_VARS+=   uuid
-
 # NetBSD-8 curses has enough support for py-curses
 USE_CURSES=    getsyx update_panels wide
 # But we build as ncurses still to get the full feature set easily
 .if ${OPSYS} == "NetBSD"
 FAKE_NCURSES=  yes
-.else
-# https://github.com/python/cpython/issues/124228
-PLIST.uuid=    yes
+## Force use of libuuid
+CONFIGURE_ARGS+=       ac_cv_header_uuid_h=false
 .endif
 
 .if ${USE_CROSS_COMPILE:tl} == yes

Index: pkgsrc/lang/python313/PLIST
diff -u pkgsrc/lang/python313/PLIST:1.8 pkgsrc/lang/python313/PLIST:1.9
--- pkgsrc/lang/python313/PLIST:1.8     Thu Aug  7 14:23:01 2025
+++ pkgsrc/lang/python313/PLIST Fri Aug  8 11:03:30 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2025/08/07 14:23:01 wiz Exp $
+@comment $NetBSD: PLIST,v 1.9 2025/08/08 11:03:30 ryoon Exp $
 bin/idle${PY_VER_SUFFIX}
 bin/pydoc${PY_VER_SUFFIX}
 bin/python${PY_VER_SUFFIX}
@@ -1807,7 +1807,7 @@ lib/python${PY_VER_SUFFIX}/lib-dynload/_
 lib/python${PY_VER_SUFFIX}/lib-dynload/_testmultiphase.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/_testsinglephase.so
 ${PLIST.tkinter}lib/python${PY_VER_SUFFIX}/lib-dynload/_tkinter.so
-${PLIST.uuid}lib/python${PY_VER_SUFFIX}/lib-dynload/_uuid.so
+lib/python${PY_VER_SUFFIX}/lib-dynload/_uuid.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/_xxtestfuzz.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/_zoneinfo.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/array.so

Index: pkgsrc/lang/python313/distinfo
diff -u pkgsrc/lang/python313/distinfo:1.10 pkgsrc/lang/python313/distinfo:1.11
--- pkgsrc/lang/python313/distinfo:1.10 Thu Aug  7 11:39:16 2025
+++ pkgsrc/lang/python313/distinfo      Fri Aug  8 11:03:30 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2025/08/07 11:39:16 adam Exp $
+$NetBSD: distinfo,v 1.11 2025/08/08 11:03:30 ryoon Exp $
 
 BLAKE2s (Python-3.13.6.tar.xz) = af238a5346716e02ab8b36c74aa11e3675ff0df03c6cd2341a74193a1978d0f8
 SHA512 (Python-3.13.6.tar.xz) = fca724dbb4f3fed889d0b51c86ee0559c70ee2c7aba1d8b089b08538d82411ec9e6bc9c7a39c1dc4bb4f13b5cf0d9a332f7759412fa540a1940477cb47052316
@@ -10,4 +10,4 @@ SHA1 (patch-Makefile.pre.in) = 127d1af79
 SHA1 (patch-Modules_faulthandler.c) = ca59c378d25bfc0769a7f5da887369d8c913e70c
 SHA1 (patch-Modules_readline.c) = 232f6ac43b5a0e87c915f13117bae91ef069a6c1
 SHA1 (patch-Modules_socketmodule.c) = 9d88a801af6e2cbd36b9935a46c8a86727222d56
-SHA1 (patch-configure) = 9abbc766a9c09473dfec2f83e3322e83080620bf
+SHA1 (patch-configure) = 0a76331c7a6f71ce98392fcf845225c0b00d78b1

Index: pkgsrc/lang/python313/patches/patch-configure
diff -u pkgsrc/lang/python313/patches/patch-configure:1.3 pkgsrc/lang/python313/patches/patch-configure:1.4
--- pkgsrc/lang/python313/patches/patch-configure:1.3   Tue Dec 24 10:47:51 2024
+++ pkgsrc/lang/python313/patches/patch-configure       Fri Aug  8 11:03:30 2025
@@ -1,13 +1,16 @@
-$NetBSD: patch-configure,v 1.3 2024/12/24 10:47:51 wiz Exp $
+$NetBSD: patch-configure,v 1.4 2025/08/08 11:03:30 ryoon Exp $
 
-Chunks 1, 4, 5: Changes for consistency across pkgsrc platforms.
+Chunks 1, 5, 6: Changes for consistency across pkgsrc platforms.
 Chunk 1: Simplify _sysconfigdata to include only platform name.
 Chunk 2: Disable barrier to cross-compilation.
 Chunk 3: should probably be handled in the Makefile instead
+Chunk 4: Do not set duplicated HAVE_UUID_H. This is a hack only for pkgsrc.
+         For upstream, detection of uuig_create and uuid_enc_be should be
+         improved.
 
---- configure.orig     2024-12-03 17:59:52.000000000 +0000
+--- configure.orig     2025-08-06 13:05:20.000000000 +0000
 +++ configure
-@@ -3708,7 +3708,7 @@ fi
+@@ -3712,7 +3712,7 @@ fi
      fi
          ac_cv_prog_PYTHON_FOR_REGEN=$with_build_python
      PYTHON_FOR_FREEZE="$with_build_python"
@@ -16,7 +19,7 @@ Chunk 3: should probably be handled in t
      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_build_python" >&5
  printf "%s\n" "$with_build_python" >&6; }
  
-@@ -4485,7 +4485,7 @@ fi
+@@ -4489,7 +4489,7 @@ fi
  
  
  
@@ -25,7 +28,7 @@ Chunk 3: should probably be handled in t
        case "$host" in
        *-*-linux*)
                case "$host_cpu" in
-@@ -9670,7 +9670,7 @@ fi
+@@ -9684,7 +9684,7 @@ fi
  
  case $GCC in
  yes)
@@ -34,7 +37,22 @@ Chunk 3: should probably be handled in t
  
  
  
-@@ -24579,7 +24579,7 @@ printf "%s\n" "#define ALT_SOABI \"${ALT
+@@ -13797,14 +13797,6 @@ then :
+ 
+ fi
+ 
+-# gh-124228: While the libuuid library is available on NetBSD, it supports only UUID version 4.
+-# This restriction inhibits the proper generation of time-based UUIDs.
+-if test "$ac_sys_system" = "NetBSD"; then
+-  have_uuid=missing
+-  printf "%s\n" "#define HAVE_UUID_H 0" >>confdefs.h
+-
+-fi
+-
+ if test "x$have_uuid" = xmissing
+ then :
+   have_uuid=no
+@@ -24846,7 +24838,7 @@ printf "%s\n" "#define ALT_SOABI \"${ALT
  fi
  
  
@@ -43,7 +61,7 @@ Chunk 3: should probably be handled in t
  
  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking LDVERSION" >&5
  printf %s "checking LDVERSION... " >&6; }
-@@ -24645,11 +24645,7 @@ fi
+@@ -24912,11 +24904,7 @@ fi