CVS commit: pkgsrc/lang

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Tue Aug 15 14:39:08 UTC 2023

Modified Files:
        pkgsrc/lang/python310: Makefile
        pkgsrc/lang/python311: Makefile
        pkgsrc/lang/python38: Makefile
        pkgsrc/lang/python39: Makefile

Log Message:
python3*: when linking with pkgsrc gettext, pass -lintl. When linking
with builtin gettext, NFCI. Fixes PREFER_PKGSRC=gettext-lib builds on at
least NetBSD 9 and 10.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 pkgsrc/lang/python310/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/lang/python311/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/lang/python38/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/lang/python39/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.19 pkgsrc/lang/python310/Makefile:1.20
--- pkgsrc/lang/python310/Makefile:1.19 Thu Jun 29 01:32:17 2023
+++ pkgsrc/lang/python310/Makefile      Tue Aug 15 14:39:08 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2023/06/29 01:32:17 riastradh Exp $
+# $NetBSD: Makefile,v 1.20 2023/08/15 14:39:08 schmonz Exp $
 
 .include "dist.mk"
 
@@ -215,6 +215,9 @@ BUILDLINK_DEPMETHOD.readline=               build
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../archivers/xz/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
+.if ${USE_BUILTIN.gettext:U:tl} == no
+CONFIGURE_ENV+=                ac_cv_lib_intl_textdomain=yes
+.endif
 .include "../../devel/libffi/buildlink3.mk"
 .include "../../devel/libuuid/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"

Index: pkgsrc/lang/python311/Makefile
diff -u pkgsrc/lang/python311/Makefile:1.9 pkgsrc/lang/python311/Makefile:1.10
--- pkgsrc/lang/python311/Makefile:1.9  Sat Jul 22 18:27:45 2023
+++ pkgsrc/lang/python311/Makefile      Tue Aug 15 14:39:08 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2023/07/22 18:27:45 js Exp $
+# $NetBSD: Makefile,v 1.10 2023/08/15 14:39:08 schmonz Exp $
 
 .include "dist.mk"
 
@@ -214,6 +214,9 @@ BUILDLINK_DEPMETHOD.readline=               build
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../archivers/xz/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
+.if ${USE_BUILTIN.gettext:U:tl} == no
+CONFIGURE_ENV+=                ac_cv_lib_intl_textdomain=yes
+.endif
 .include "../../devel/libffi/buildlink3.mk"
 .include "../../devel/libuuid/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"

Index: pkgsrc/lang/python38/Makefile
diff -u pkgsrc/lang/python38/Makefile:1.29 pkgsrc/lang/python38/Makefile:1.30
--- pkgsrc/lang/python38/Makefile:1.29  Tue Jun 27 10:35:30 2023
+++ pkgsrc/lang/python38/Makefile       Tue Aug 15 14:39:08 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2023/06/27 10:35:30 riastradh Exp $
+# $NetBSD: Makefile,v 1.30 2023/08/15 14:39:08 schmonz Exp $
 
 .include "dist.mk"
 
@@ -204,6 +204,9 @@ BUILDLINK_DEPMETHOD.readline=               build
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../archivers/xz/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
+.if ${USE_BUILTIN.gettext:U:tl} == no
+CONFIGURE_ENV+=                ac_cv_lib_intl_textdomain=yes
+.endif
 .include "../../devel/libffi/buildlink3.mk"
 .include "../../devel/libuuid/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"

Index: pkgsrc/lang/python39/Makefile
diff -u pkgsrc/lang/python39/Makefile:1.25 pkgsrc/lang/python39/Makefile:1.26
--- pkgsrc/lang/python39/Makefile:1.25  Thu Jun 29 01:32:06 2023
+++ pkgsrc/lang/python39/Makefile       Tue Aug 15 14:39:08 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2023/06/29 01:32:06 riastradh Exp $
+# $NetBSD: Makefile,v 1.26 2023/08/15 14:39:08 schmonz Exp $
 
 .include "dist.mk"
 
@@ -215,6 +215,9 @@ BUILDLINK_DEPMETHOD.readline=               build
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../archivers/xz/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
+.if ${USE_BUILTIN.gettext:U:tl} == no
+CONFIGURE_ENV+=                ac_cv_lib_intl_textdomain=yes
+.endif
 .include "../../devel/libffi/buildlink3.mk"
 .include "../../devel/libuuid/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"