pkgsrc-Bugs archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Re: pkg/58875: python: terminal colours broke in some applications
The following reply was made to PR pkg/58875; it has been noted by GNATS.
From: Taylor R Campbell <riastradh%NetBSD.org@localhost>
To: gnats-bugs%NetBSD.org@localhost, pkgsrc-bugs%NetBSD.org@localhost
Cc: Aleksey Cheusov <cheusov%NetBSD.org@localhost>,
Christos Zoulas <christos%NetBSD.org@localhost>
Subject: Re: pkg/58875: python: terminal colours broke in some applications
Date: Thu, 5 Dec 2024 14:57:55 +0000
[cc committer cheusov@ and libedit wizard christos@]
Building lang/python311 with READLINE_TYPE=3Dreadline, instead of the
default READLINE_TYPE=3Deditline, fixes it. So this is probably a
regression caused by:
https://mail-index.netbsd.org/pkgsrc-changes/2024/04/30/msg298643.html
(and/or possibly caused by a bug in libedit which is yet to be
diagnosed)
Module Name: pkgsrc
Committed By: cheusov
Date: Tue Apr 30 17:01:15 UTC 2024
Modified Files:
pkgsrc/lang/python311: Makefile options.mk
Log Message:
Add option "readline" enabled by default.
Either --with-readline=3Deditline or --with-readline are added
to CONFIGURE_ARGS depending on READLINE_TYPE.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 pkgsrc/lang/python311/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/python311/options.mk
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.25 pkgsrc/lang/python311/Makefile:=
1.26
--- pkgsrc/lang/python311/Makefile:1.25 Fri Feb 2 15:50:55 2024
+++ pkgsrc/lang/python311/Makefile Tue Apr 30 17:01:15 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2024/02/02 15:50:55 tsutsui Exp $
+# $NetBSD: Makefile,v 1.26 2024/04/30 17:01:15 cheusov Exp $
=20
.include "dist.mk"
=20
@@ -38,7 +38,6 @@ USE_CC_FEATURES+=3D c11
GNU_CONFIGURE=3D yes
CONFIGURE_ARGS+=3D --enable-shared
CONFIGURE_ARGS+=3D --with-openssl=3D${BUILDLINK_PREFIX.openssl}
-CONFIGURE_ARGS+=3D --with-readline=3Dreadline # XXX editline?
CONFIGURE_ARGS+=3D --with-system-expat
CONFIGURE_ARGS+=3D --with-system-ffi
CONFIGURE_ARGS+=3D --without-ensurepip
@@ -246,7 +245,6 @@ CONFIGURE_ENV+=3D ac_cv_lib_intl_textdoma
.endif
.include "../../devel/libffi/buildlink3.mk"
.include "../../devel/libuuid/buildlink3.mk"
-.include "../../devel/readline/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
.include "../../textproc/expat/buildlink3.mk"
Index: pkgsrc/lang/python311/options.mk
diff -u pkgsrc/lang/python311/options.mk:1.1 pkgsrc/lang/python311/options.=
mk:1.2
--- pkgsrc/lang/python311/options.mk:1.1 Mon Oct 31 09:50:40 2022
+++ pkgsrc/lang/python311/options.mk Tue Apr 30 17:01:15 2024
@@ -1,13 +1,13 @@
-# $NetBSD: options.mk,v 1.1 2022/10/31 09:50:40 adam Exp $
+# $NetBSD: options.mk,v 1.2 2024/04/30 17:01:15 cheusov Exp $
=20
PKG_OPTIONS_VAR=3D PKG_OPTIONS.python311
-PKG_SUPPORTED_OPTIONS=3D dtrace pymalloc x11
-PKG_SUGGESTED_OPTIONS=3D x11
+PKG_SUPPORTED_OPTIONS=3D dtrace pymalloc x11 readline
+PKG_SUGGESTED_OPTIONS=3D x11 readline
=20
.include "../../mk/bsd.prefs.mk"
.include "../../mk/bsd.options.mk"
=20
-PLIST_VARS+=3D dtrace
+PLIST_VARS+=3D dtrace readline
=20
.if !empty(PKG_OPTIONS:Mdtrace)
CONFIGURE_ARGS+=3D --with-dtrace
@@ -39,3 +39,16 @@ CONFIGURE_ARGS+=3D --with-pymalloc
.else
CONFIGURE_ARGS+=3D --without-pymalloc
.endif
+
+# readline/editline
+.if empty(PKG_OPTIONS:Mreadline)
+CONFIGURE_ARGS+=3D --without-readline
+.else
+.include "../../mk/readline.buildlink3.mk"
+.if ${READLINE_TYPE} =3D=3D "editline"
+CONFIGURE_ARGS+=3D --with-readline=3Deditline
+.else
+CONFIGURE_ARGS+=3D --with-readline
+.endif
+PLIST.readline=3D yes
+.endif
Home |
Main Index |
Thread Index |
Old Index