CVS commit: pkgsrc/lang

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Fri Mar 20 14:01:10 UTC 2026

Modified Files:
        pkgsrc/lang/python311: Makefile
        pkgsrc/lang/python312: Makefile
        pkgsrc/lang/python313: Makefile
        pkgsrc/lang/python314: Makefile

Log Message:
python31*: force use expat from pkgsrc to fix builds across platforms


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 pkgsrc/lang/python311/Makefile
cvs rdiff -u -r1.34 -r1.35 pkgsrc/lang/python312/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/lang/python313/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/lang/python314/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/python311/Makefile
diff -u pkgsrc/lang/python311/Makefile:1.45 pkgsrc/lang/python311/Makefile:1.46
--- pkgsrc/lang/python311/Makefile:1.45 Thu Mar 19 16:58:45 2026
+++ pkgsrc/lang/python311/Makefile      Fri Mar 20 14:01:10 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2026/03/19 16:58:45 adam Exp $
+# $NetBSD: Makefile,v 1.46 2026/03/20 14:01:10 adam Exp $
 
 .include "dist.mk"
 
@@ -38,9 +38,9 @@ USE_TOOLS+=           pkg-config
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --enable-shared
 CONFIGURE_ARGS+=       --with-openssl=${BUILDLINK_PREFIX.openssl}
+CONFIGURE_ARGS+=       --with-system-expat
 CONFIGURE_ARGS+=       --with-system-ffi
 CONFIGURE_ARGS+=       --without-ensurepip
-CONFIGURE_ARGS+=       --without-system-expat # requires expat_config.h
 CONFIGURE_ENV+=                OPT=${CFLAGS:M*:Q}
 CONFIGURE_ENV+=                ac_cv_path_mkdir=${TOOLS_PATH.mkdir}
 PKGCONFIG_OVERRIDE+=   Misc/python.pc.in Misc/python-embed.pc.in
@@ -250,6 +250,7 @@ CONFIGURE_ENV+=             ac_cv_lib_intl_textdoma
 .include "../../devel/libuuid/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
+PREFER.expat=  pkgsrc # needs expat_config.h
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../mk/bdb.buildlink3.mk"
 .include "../../mk/curses.buildlink3.mk"

Index: pkgsrc/lang/python312/Makefile
diff -u pkgsrc/lang/python312/Makefile:1.34 pkgsrc/lang/python312/Makefile:1.35
--- pkgsrc/lang/python312/Makefile:1.34 Wed Mar  4 06:50:49 2026
+++ pkgsrc/lang/python312/Makefile      Fri Mar 20 14:01:10 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2026/03/04 06:50:49 adam Exp $
+# $NetBSD: Makefile,v 1.35 2026/03/20 14:01:10 adam Exp $
 
 .include "dist.mk"
 
@@ -41,7 +41,6 @@ CONFIGURE_ARGS+=      --enable-shared
 CONFIGURE_ARGS+=       --with-openssl=${BUILDLINK_PREFIX.openssl}
 CONFIGURE_ARGS+=       --with-system-expat
 CONFIGURE_ARGS+=       --without-ensurepip
-CONFIGURE_ARGS+=       --without-system-expat # requires expat_config.h
 CONFIGURE_ENV+=                OPT=${CFLAGS:M*:Q}
 CONFIGURE_ENV+=                ac_cv_path_mkdir=${TOOLS_PATH.mkdir}
 CONFIGURE_ENV+=                py_cv_module__gdbm="n/a"
@@ -251,6 +250,7 @@ CONFIGURE_ENV+=             ac_cv_lib_intl_textdoma
 .include "../../devel/libuuid/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
+PREFER.expat=  pkgsrc # needs expat_config.h
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../mk/bdb.buildlink3.mk"
 .include "../../mk/curses.buildlink3.mk"

Index: pkgsrc/lang/python313/Makefile
diff -u pkgsrc/lang/python313/Makefile:1.30 pkgsrc/lang/python313/Makefile:1.31
--- pkgsrc/lang/python313/Makefile:1.30 Wed Feb  4 14:15:49 2026
+++ pkgsrc/lang/python313/Makefile      Fri Mar 20 14:01:10 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2026/02/04 14:15:49 adam Exp $
+# $NetBSD: Makefile,v 1.31 2026/03/20 14:01:10 adam Exp $
 
 .include "dist.mk"
 
@@ -39,8 +39,8 @@ GNU_CONFIGURE=                yes
 GNU_CONFIGURE_ICONV=   no
 CONFIGURE_ARGS+=       --enable-shared
 CONFIGURE_ARGS+=       --with-openssl=${BUILDLINK_PREFIX.openssl}
+CONFIGURE_ARGS+=       --with-system-expat
 CONFIGURE_ARGS+=       --without-ensurepip
-CONFIGURE_ARGS+=       --without-system-expat # requires expat_config.h
 CONFIGURE_ENV+=                OPT=${CFLAGS:M*:Q}
 CONFIGURE_ENV+=                ac_cv_path_mkdir=${TOOLS_PATH.mkdir}
 CONFIGURE_ENV+=                py_cv_module__gdbm="n/a"
@@ -227,6 +227,8 @@ CONFIGURE_ENV+=             ac_cv_lib_intl_textdoma
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../math/mpdecimal/buildlink3.mk"
+PREFER.expat=  pkgsrc # needs expat_config.h
+.include "../../textproc/expat/buildlink3.mk"
 .include "../../mk/atomic64.mk"
 .include "../../mk/bdb.buildlink3.mk"
 .include "../../mk/curses.buildlink3.mk"

Index: pkgsrc/lang/python314/Makefile
diff -u pkgsrc/lang/python314/Makefile:1.11 pkgsrc/lang/python314/Makefile:1.12
--- pkgsrc/lang/python314/Makefile:1.11 Tue Feb  3 20:30:46 2026
+++ pkgsrc/lang/python314/Makefile      Fri Mar 20 14:01:10 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2026/02/03 20:30:46 adam Exp $
+# $NetBSD: Makefile,v 1.12 2026/03/20 14:01:10 adam Exp $
 
 .include "dist.mk"
 
@@ -26,8 +26,8 @@ USE_CC_FEATURES+=     c11
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --enable-shared
 CONFIGURE_ARGS+=       --with-openssl=${BUILDLINK_PREFIX.openssl}
+CONFIGURE_ARGS+=       --with-system-expat
 CONFIGURE_ARGS+=       --without-ensurepip
-CONFIGURE_ARGS+=       --without-system-expat # requires expat_config.h
 CONFIGURE_ENV+=                OPT=${CFLAGS:M*:Q}
 CONFIGURE_ENV+=                ac_cv_path_mkdir=${TOOLS_PATH.mkdir}
 CONFIGURE_ENV+=                py_cv_module__gdbm="n/a"
@@ -215,6 +215,8 @@ CONFIGURE_ENV+=             ac_cv_lib_intl_textdoma
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../math/mpdecimal/buildlink3.mk"
+PREFER.expat=  pkgsrc # needs expat_config.h
+.include "../../textproc/expat/buildlink3.mk"
 .include "../../mk/atomic64.mk"
 .include "../../mk/bdb.buildlink3.mk"
 .include "../../mk/curses.buildlink3.mk"