Attachment #222540 for bug #253603

View | Details | Raw Unified | Return to bug 253603
Collapse All | Expand All




			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_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


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




--- Modules/_decimal/_decimal.c.orig	2021-02-17 20:39:05 UTC
+++ Modules/_decimal/_decimal.c
@@ -3284,7 +3284,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) {
@@ -3293,7 +3293,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) {

Line 0 Link Here

(-)python38/files/patch-setup.py (+11 lines)
	1	--- setup.py.orig 2021-02-17 20:38:06 UTC
	2	+++ setup.py
	3	@@ -2077,7 +2077,7 @@ class PyBuildExt(build_ext):
	4	undef_macros = []
	5	if '--with-system-libmpdec' in sysconfig.get_config_var("CONFIG_ARGS"):
	6	include_dirs = []
	7	- libraries = [':libmpdec.so.2']
	8	+ libraries = ['mpdec']
	9	sources = ['_decimal/_decimal.c']
	10	depends = ['_decimal/docstrings.h']
	11	else:

Return to bug 253603

Lines 50-61 Link Here

(-)python38/Makefile (-1 / +6 lines)
50	OSMAJOR=${OSVERSION:C/([0-9])[0-9]{5}/\1/} # For plat-freebsd in pkg-plist. https://bugs.python.org/issue19554	50	OSMAJOR=${OSVERSION:C/([0-9])[0-9]{5}/\1/} # For plat-freebsd in pkg-plist. https://bugs.python.org/issue19554
51		51
52	OPTIONS_DEFINE= DEBUG IPV6 LIBFFI NLS PYMALLOC	52	OPTIONS_DEFINE= DEBUG IPV6 LIBFFI NLS PYMALLOC
53	OPTIONS_DEFAULT= LIBFFI PYMALLOC	53	OPTIONS_DEFINE= DEBUG IPV6 LIBFFI LIBMPDEC NLS PYMALLOC
		54	OPTIONS_DEFAULT= LIBFFI LIBMPDEC PYMALLOC
54	OPTIONS_RADIO= HASH	55	OPTIONS_RADIO= HASH
55	OPTIONS_RADIO_HASH= FNV SIPHASH	56	OPTIONS_RADIO_HASH= FNV SIPHASH
56	OPTIONS_SUB= yes	57	OPTIONS_SUB= yes
57		58
58	LIBFFI_DESC= Use libffi from ports instead of bundled version	59	LIBFFI_DESC= Use libffi from ports instead of bundled version
		60	LIBMPDEC_DESC= Use libmpdec from ports instead of bundled version
59	NLS_DESC= Enable gettext support for the locale module	61	NLS_DESC= Enable gettext support for the locale module
60	PYMALLOC_DESC= Enable specialized mallocs	62	PYMALLOC_DESC= Enable specialized mallocs
61		63
Lines 72-77 Link Here
72	LIBFFI_CONFIGURE_ON= --with-system-ffi	74	LIBFFI_CONFIGURE_ON= --with-system-ffi
73	LIBFFI_LIB_DEPENDS= libffi.so:devel/libffi	75	LIBFFI_LIB_DEPENDS= libffi.so:devel/libffi
74		76
		77	LIBMPDEC_CONFIGURE_ON= --with-system-libmpdec
		78	LIBMPDEC_LIB_DEPENDS= libmpdec.so:math/mpdecimal
		79
75	# Use CPPFLAGS over CFLAGS due to -I ordering, causing elementtree and pyexpat	80	# Use CPPFLAGS over CFLAGS due to -I ordering, causing elementtree and pyexpat
76	# to break in Python 2.7, or preprocessor complaints in Python >= 3.3	81	# to break in Python 2.7, or preprocessor complaints in Python >= 3.3
77	# Upstream Issue: https://bugs.python.org/issue6299	82	# Upstream Issue: https://bugs.python.org/issue6299

Line 0 Link Here

(-)python38/files/patch-Modules___decimal___decimal.c (+20 lines)
	1	--- Modules/_decimal/_decimal.c.orig 2021-02-17 20:39:05 UTC
	2	+++ Modules/_decimal/_decimal.c
	3	@@ -3284,7 +3284,7 @@ dec_format(PyObject dec, PyObject args)
	4	}
	5	else {
	6	size_t n = strlen(spec.dot);
	7	- if (n > 1 \|\| (n == 1 && !isascii((uchar)spec.dot[0]))) {
	8	+ if (n > 1 \|\| (n == 1 && !isascii((unsigned char)spec.dot[0]))) {
	9	/* fix locale dependent non-ascii characters */
	10	dot = dotsep_as_utf8(spec.dot);
	11	if (dot == NULL) {
	12	@@ -3293,7 +3293,7 @@ dec_format(PyObject dec, PyObject args)
	13	spec.dot = PyBytes_AS_STRING(dot);
	14	}
	15	n = strlen(spec.sep);
	16	- if (n > 1 \|\| (n == 1 && !isascii((uchar)spec.sep[0]))) {
	17	+ if (n > 1 \|\| (n == 1 && !isascii((unsigned char)spec.sep[0]))) {
	18	/* fix locale dependent non-ascii characters */
	19	sep = dotsep_as_utf8(spec.sep);
	20	if (sep == NULL) {