Page MenuHomeFreeBSD

D35282.id106251.diff
No OneTemporary

D35282.id106251.diff

Index: lang/python310/Makefile
===================================================================
--- lang/python310/Makefile
+++ lang/python310/Makefile
@@ -16,7 +16,7 @@
LIB_DEPENDS= libffi.so:devel/libffi
-USES= compiler:c11 cpe ncurses pathfix pkgconfig readline \
+USES= compiler:c11 cpe ncurses pathfix pkgconfig \
shebangfix ssl tar:xz
PATHFIX_MAKEFILEIN= Makefile.pre.in
USE_LDCONFIG= yes
@@ -54,11 +54,13 @@
OSMAJOR=${OSVERSION:C/([0-9]*)[0-9]{5}/\1/} # For plat-freebsd* in pkg-plist. https://bugs.python.org/issue19554
OPTIONS_DEFINE= DEBUG IPV6 LIBMPDEC LTO NLS PYMALLOC
-OPTIONS_DEFAULT= LIBMPDEC PYMALLOC
+OPTIONS_DEFAULT= LIBMPDEC PYMALLOC LINE_READPORT
OPTIONS_EXCLUDE_powerpc64= LTO
OPTIONS_EXCLUDE_riscv64= LTO
OPTIONS_RADIO= HASH
OPTIONS_RADIO_HASH= FNV SIPHASH
+OPTIONS_SINGLE= LINE
+OPTIONS_SINGLE_LINE= LINE_EDITBASE LINE_EDITPORT LINE_READPORT LINE_NONE
OPTIONS_SUB= yes
LIBMPDEC_DESC= Use libmpdec from ports instead of bundled version
@@ -69,6 +71,12 @@
FNV_DESC= Modified Fowler-Noll-Vo Algorithm
SIPHASH_DESC= SipHash24 Algorithm
+LINE_DESC= Line editing library
+LINE_EDITBASE_DESC= editline (base)
+LINE_EDITPORT_DESC= editline (ports)
+LINE_READPORT_DESC= readline (ports)
+LINE_NONE_DESC= none
+
FNV_CONFIGURE_ON= --with-hash-algorithm=fnv
SIPHASH_CONFIGURE_ON= --with-hash-algorithm=siphash24
@@ -80,6 +88,13 @@
LTO_CONFIGURE_ON= --with-lto
+LINE_EDITBASE_CONFIGURE_ON= --with-readline=editline
+LINE_EDITPORT_USES= libedit
+LINE_EDITPORT_CONFIGURE_ON= --with-readline=editline
+LINE_READPORT_USES= readline
+LINE_READPORT_CONFIGURE_ON= --with-readline
+LINE_NONE_CONFIGURE_ON= --without-readline
+
# Use CPPFLAGS over CFLAGS due to -I ordering, causing elementtree and pyexpat
# to break in Python 2.7, or preprocessor complaints in Python >= 3.3
# Upstream Issue: https://bugs.python.org/issue6299
Index: lang/python310/pkg-plist
===================================================================
--- lang/python310/pkg-plist
+++ lang/python310/pkg-plist
@@ -2926,7 +2926,7 @@
%%NO_NIS%%lib/python%%XYDOT%%/lib-dynload/nis.cpython-%%XY%%%%ABI%%.so
lib/python%%XYDOT%%/lib-dynload/ossaudiodev.cpython-%%XY%%%%ABI%%.so
lib/python%%XYDOT%%/lib-dynload/pyexpat.cpython-%%XY%%%%ABI%%.so
-lib/python%%XYDOT%%/lib-dynload/readline.cpython-%%XY%%%%ABI%%.so
+%%NO_LINE_NONE%%lib/python%%XYDOT%%/lib-dynload/readline.cpython-%%XY%%%%ABI%%.so
lib/python%%XYDOT%%/lib-dynload/resource.cpython-%%XY%%%%ABI%%.so
lib/python%%XYDOT%%/lib-dynload/select.cpython-%%XY%%%%ABI%%.so
lib/python%%XYDOT%%/lib-dynload/syslog.cpython-%%XY%%%%ABI%%.so

File Metadata

Mime Type
text/plain
Expires
Tue, Mar 24, 6:23 AM (29 m, 41 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
30232004
Default Alt Text
D35282.id106251.diff (2 KB)

Event Timeline