CVS commit: pkgsrc/lang

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Mar 25 22:52:08 UTC 2026

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

Log Message:
python*: restrict expat workaround to NetBSD<11.99.5

that version installs expat_config.h

Pullups for 10, 11 have been filed, the pattern can be improved
when they are merged.


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 pkgsrc/lang/python310/Makefile
cvs rdiff -u -r1.46 -r1.47 pkgsrc/lang/python311/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/lang/python312/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/lang/python313/Makefile
cvs rdiff -u -r1.12 -r1.13 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/python310/Makefile
diff -u pkgsrc/lang/python310/Makefile:1.44 pkgsrc/lang/python310/Makefile:1.45
--- pkgsrc/lang/python310/Makefile:1.44 Wed Mar  4 07:03:17 2026
+++ pkgsrc/lang/python310/Makefile      Wed Mar 25 22:52:07 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2026/03/04 07:03:17 adam Exp $
+# $NetBSD: Makefile,v 1.45 2026/03/25 22:52:07 wiz Exp $
 
 .include "dist.mk"
 
@@ -40,7 +40,7 @@ CONFIGURE_ARGS+=      --with-openssl=${BUILDL
 CONFIGURE_ARGS+=       --with-readline=readline # XXX editline?
 CONFIGURE_ARGS+=       --with-system-ffi
 CONFIGURE_ARGS+=       --without-ensurepip
-CONFIGURE_ARGS+=       --without-system-expat # requires expat_config.h
+CONFIGURE_ARGS+=       --with-system-expat
 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
@@ -240,6 +240,9 @@ CONFIGURE_ENV+=             ac_cv_lib_intl_textdoma
 .include "../../devel/readline/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
+.if ${OPSYS} == NetBSD && ${OPSYS_VERSION} < 119905
+PREFER.expat=  pkgsrc # needs expat_config.h
+.endif
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../mk/bdb.buildlink3.mk"
 .include "../../mk/curses.buildlink3.mk"

Index: pkgsrc/lang/python311/Makefile
diff -u pkgsrc/lang/python311/Makefile:1.46 pkgsrc/lang/python311/Makefile:1.47
--- pkgsrc/lang/python311/Makefile:1.46 Fri Mar 20 14:01:10 2026
+++ pkgsrc/lang/python311/Makefile      Wed Mar 25 22:52:08 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2026/03/20 14:01:10 adam Exp $
+# $NetBSD: Makefile,v 1.47 2026/03/25 22:52:08 wiz Exp $
 
 .include "dist.mk"
 
@@ -250,7 +250,9 @@ CONFIGURE_ENV+=             ac_cv_lib_intl_textdoma
 .include "../../devel/libuuid/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
+.if ${OPSYS} == NetBSD && ${OPSYS_VERSION} < 119905
 PREFER.expat=  pkgsrc # needs expat_config.h
+.endif
 .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.35 pkgsrc/lang/python312/Makefile:1.36
--- pkgsrc/lang/python312/Makefile:1.35 Fri Mar 20 14:01:10 2026
+++ pkgsrc/lang/python312/Makefile      Wed Mar 25 22:52:08 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2026/03/20 14:01:10 adam Exp $
+# $NetBSD: Makefile,v 1.36 2026/03/25 22:52:08 wiz Exp $
 
 .include "dist.mk"
 
@@ -250,7 +250,9 @@ CONFIGURE_ENV+=             ac_cv_lib_intl_textdoma
 .include "../../devel/libuuid/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
+.if ${OPSYS} == NetBSD && ${OPSYS_VERSION} < 119905
 PREFER.expat=  pkgsrc # needs expat_config.h
+.endif
 .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.31 pkgsrc/lang/python313/Makefile:1.32
--- pkgsrc/lang/python313/Makefile:1.31 Fri Mar 20 14:01:10 2026
+++ pkgsrc/lang/python313/Makefile      Wed Mar 25 22:52:08 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2026/03/20 14:01:10 adam Exp $
+# $NetBSD: Makefile,v 1.32 2026/03/25 22:52:08 wiz Exp $
 
 .include "dist.mk"
 
@@ -227,7 +227,9 @@ CONFIGURE_ENV+=             ac_cv_lib_intl_textdoma
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../math/mpdecimal/buildlink3.mk"
+.if ${OPSYS} == NetBSD && ${OPSYS_VERSION} < 119905
 PREFER.expat=  pkgsrc # needs expat_config.h
+.endif
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../mk/atomic64.mk"
 .include "../../mk/bdb.buildlink3.mk"

Index: pkgsrc/lang/python314/Makefile
diff -u pkgsrc/lang/python314/Makefile:1.12 pkgsrc/lang/python314/Makefile:1.13
--- pkgsrc/lang/python314/Makefile:1.12 Fri Mar 20 14:01:10 2026
+++ pkgsrc/lang/python314/Makefile      Wed Mar 25 22:52:08 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2026/03/20 14:01:10 adam Exp $
+# $NetBSD: Makefile,v 1.13 2026/03/25 22:52:08 wiz Exp $
 
 .include "dist.mk"
 
@@ -215,7 +215,9 @@ CONFIGURE_ENV+=             ac_cv_lib_intl_textdoma
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../math/mpdecimal/buildlink3.mk"
+.if ${OPSYS} == NetBSD && ${OPSYS_VERSION} < 119905
 PREFER.expat=  pkgsrc # needs expat_config.h
+.endif
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../mk/atomic64.mk"
 .include "../../mk/bdb.buildlink3.mk"