Attachment 222562 Details for Bug 253604 – updated patch

[patch] updated patch

python39-system-libmpdec-rev1.diff (text/plain), 3.84 KB, created by Steve Wills on 2021-02-18 21:16:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steve Wills

Created: 2021-02-18 21:16:44 UTC

Size: 3.84 KB

patch

obsolete

>diff --git lang/python39/Makefile lang/python39/Makefile
>index 9ce6ef92d793..2016a60df199 100644
>--- lang/python39/Makefile
>+++ lang/python39/Makefile
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	python
> PORTVERSION=	${PYTHON_PORTVERSION}
>+PORTREVISION=	1
> CATEGORIES=	lang python
> MASTER_SITES=	PYTHON/ftp/python/${PORTVERSION}
> PKGNAMESUFFIX=	${PYTHON_SUFFIX}
>@@ -50,13 +51,14 @@ PLIST_SUB=		ABI=${ABIFLAGS} \
> 			XYZDOT=${PORTVERSION} \
> 			OSMAJOR=${OSVERSION:C/([0-9]*)[0-9]{5}/\1/}		# For plat-freebsd* in pkg-plist. https://bugs.python.org/issue19554
> 
>-OPTIONS_DEFINE=		DEBUG IPV6 LIBFFI NLS PYMALLOC
>-OPTIONS_DEFAULT=	LIBFFI PYMALLOC
>+OPTIONS_DEFINE=		DEBUG IPV6 LIBFFI LIBMPDEC NLS PYMALLOC
>+OPTIONS_DEFAULT=	LIBFFI LIBMPDEC PYMALLOC
> OPTIONS_RADIO=		HASH
> OPTIONS_RADIO_HASH=	FNV SIPHASH
> OPTIONS_SUB=		yes
> 
> LIBFFI_DESC=		Use libffi from ports instead of bundled version
>+LIBMPDEC_DESC=		Use libmpdec from ports instead of bundled version
> NLS_DESC=		Enable gettext support for the locale module
> PYMALLOC_DESC=		Enable specialized mallocs
> 
>@@ -73,6 +75,9 @@ IPV6_CONFIGURE_ENABLE=	ipv6
> LIBFFI_CONFIGURE_ON=	--with-system-ffi
> LIBFFI_LIB_DEPENDS=	libffi.so:devel/libffi
> 
>+LIBMPDEC_CONFIGURE_ON=	--with-system-libmpdec
>+LIBMPDEC_LIB_DEPENDS=	libmpdec.so:math/mpdecimal
>+
> # 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
>diff --git lang/python39/files/patch-Modules___decimal___decimal.c lang/python39/files/patch-Modules___decimal___decimal.c
>new file mode 100644
>index 000000000000..12715927ce50
>--- /dev/null
>+++ lang/python39/files/patch-Modules___decimal___decimal.c
>@@ -0,0 +1,20 @@
>+--- Modules/_decimal/_decimal.c.orig	2020-12-07 14:02:38 UTC
>++++ Modules/_decimal/_decimal.c
>+@@ -3280,7 +3280,7 @@ dec_format(PyObject *dec, PyObject *args)
>+     }
>+     else {
>+         size_t n = strlen(spec.dot);
>+-        if (n > 1 || (n == 1 && !isascii((uchar)spec.dot[0]))) {
>++        if (n > 1 || (n == 1 && !isascii((unsigned char)spec.dot[0]))) {
>+             /* fix locale dependent non-ascii characters */
>+             dot = dotsep_as_utf8(spec.dot);
>+             if (dot == NULL) {
>+@@ -3289,7 +3289,7 @@ dec_format(PyObject *dec, PyObject *args)
>+             spec.dot = PyBytes_AS_STRING(dot);
>+         }
>+         n = strlen(spec.sep);
>+-        if (n > 1 || (n == 1 && !isascii((uchar)spec.sep[0]))) {
>++        if (n > 1 || (n == 1 && !isascii((unsigned char)spec.sep[0]))) {
>+             /* fix locale dependent non-ascii characters */
>+             sep = dotsep_as_utf8(spec.sep);
>+             if (sep == NULL) {
>diff --git lang/python39/files/patch-setup.py lang/python39/files/patch-setup.py
>new file mode 100644
>index 000000000000..1c943df2af34
>--- /dev/null
>+++ lang/python39/files/patch-setup.py
>@@ -0,0 +1,11 @@
>+--- setup.py.orig	2021-02-17 17:43:29 UTC
>++++ setup.py
>+@@ -2196,7 +2196,7 @@ class PyBuildExt(build_ext):
>+         undef_macros = []
>+         if '--with-system-libmpdec' in sysconfig.get_config_var("CONFIG_ARGS"):
>+             include_dirs = []
>+-            libraries = [':libmpdec.so.2']
>++            libraries = ['mpdec']
>+             sources = ['_decimal/_decimal.c']
>+             depends = ['_decimal/docstrings.h']
>+         else:
>diff --git lang/python39/pkg-plist lang/python39/pkg-plist
>index d2fffb57c43d..d2b52bbddc74 100644
>--- lang/python39/pkg-plist
>+++ lang/python39/pkg-plist
>@@ -2836,7 +2836,7 @@ lib/python%%XYDOT%%/lib-dynload/_curses.so
> lib/python%%XYDOT%%/lib-dynload/_curses_panel.so
> lib/python%%XYDOT%%/lib-dynload/_datetime.so
> lib/python%%XYDOT%%/lib-dynload/_dbm.so
>-lib/python%%XYDOT%%/lib-dynload/_decimal.so
>+%%NO_LIBMPDEC%%lib/python%%XYDOT%%/lib-dynload/_decimal.so
> lib/python%%XYDOT%%/lib-dynload/_elementtree.so
> lib/python%%XYDOT%%/lib-dynload/_hashlib.so
> lib/python%%XYDOT%%/lib-dynload/_heapq.so

Actions: View | Diff

Attachments on bug 253604: 222541 | 222560 | 222562 | 222583