View | Details | Raw Unified | Return to bug 253604 | Differences between
and this patch

Collapse All | Expand All

(-)lang/python39/Makefile (-2 / +7 lines)
Lines 3-8 Link Here
3
3
4
PORTNAME=	python
4
PORTNAME=	python
5
PORTVERSION=	${PYTHON_PORTVERSION}
5
PORTVERSION=	${PYTHON_PORTVERSION}
6
PORTREVISION=	1
6
CATEGORIES=	lang python
7
CATEGORIES=	lang python
7
MASTER_SITES=	PYTHON/ftp/python/${PORTVERSION}
8
MASTER_SITES=	PYTHON/ftp/python/${PORTVERSION}
8
PKGNAMESUFFIX=	${PYTHON_SUFFIX}
9
PKGNAMESUFFIX=	${PYTHON_SUFFIX}
Lines 50-62 PLIST_SUB= ABI=${ABIFLAGS} \ Link Here
50
			XYZDOT=${PORTVERSION} \
51
			XYZDOT=${PORTVERSION} \
51
			OSMAJOR=${OSVERSION:C/([0-9]*)[0-9]{5}/\1/}		# For plat-freebsd* in pkg-plist. https://bugs.python.org/issue19554
52
			OSMAJOR=${OSVERSION:C/([0-9]*)[0-9]{5}/\1/}		# For plat-freebsd* in pkg-plist. https://bugs.python.org/issue19554
52
53
53
OPTIONS_DEFINE=		DEBUG IPV6 LIBFFI NLS PYMALLOC
54
OPTIONS_DEFINE=		DEBUG IPV6 LIBFFI LIBMPDEC NLS PYMALLOC
54
OPTIONS_DEFAULT=	LIBFFI PYMALLOC
55
OPTIONS_DEFAULT=	LIBFFI LIBMPDEC PYMALLOC
55
OPTIONS_RADIO=		HASH
56
OPTIONS_RADIO=		HASH
56
OPTIONS_RADIO_HASH=	FNV SIPHASH
57
OPTIONS_RADIO_HASH=	FNV SIPHASH
57
OPTIONS_SUB=		yes
58
OPTIONS_SUB=		yes
58
59
59
LIBFFI_DESC=		Use libffi from ports instead of bundled version
60
LIBFFI_DESC=		Use libffi from ports instead of bundled version
61
LIBMPDEC_DESC=		Use libmpdec from ports instead of bundled version
60
NLS_DESC=		Enable gettext support for the locale module
62
NLS_DESC=		Enable gettext support for the locale module
61
PYMALLOC_DESC=		Enable specialized mallocs
63
PYMALLOC_DESC=		Enable specialized mallocs
62
64
Lines 73-78 IPV6_CONFIGURE_ENABLE= ipv6 Link Here
73
LIBFFI_CONFIGURE_ON=	--with-system-ffi
75
LIBFFI_CONFIGURE_ON=	--with-system-ffi
74
LIBFFI_LIB_DEPENDS=	libffi.so:devel/libffi
76
LIBFFI_LIB_DEPENDS=	libffi.so:devel/libffi
75
77
78
LIBMPDEC_CONFIGURE_ON=	--with-system-libmpdec
79
LIBMPDEC_LIB_DEPENDS=	libmpdec.so:math/mpdecimal
80
76
# Use CPPFLAGS over CFLAGS due to -I ordering, causing elementtree and pyexpat
81
# Use CPPFLAGS over CFLAGS due to -I ordering, causing elementtree and pyexpat
77
# to break in Python 2.7, or preprocessor complaints in Python >= 3.3
82
# to break in Python 2.7, or preprocessor complaints in Python >= 3.3
78
# Upstream Issue: https://bugs.python.org/issue6299
83
# Upstream Issue: https://bugs.python.org/issue6299
(-)lang/python39/files/patch-Modules___decimal___decimal.c (+20 lines)
Added Link Here
1
--- Modules/_decimal/_decimal.c.orig	2020-12-07 14:02:38 UTC
2
+++ Modules/_decimal/_decimal.c
3
@@ -3280,7 +3280,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
@@ -3289,7 +3289,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) {
(-)lang/python39/files/patch-setup.py (+11 lines)
Added Link Here
1
--- setup.py.orig	2021-02-17 17:43:29 UTC
2
+++ setup.py
3
@@ -2196,7 +2196,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:
(-)lang/python39/pkg-plist (-1 / +1 lines)
Lines 2836-2842 lib/python%%XYDOT%%/lib-dynload/_curses.so Link Here
2836
lib/python%%XYDOT%%/lib-dynload/_curses_panel.so
2836
lib/python%%XYDOT%%/lib-dynload/_curses_panel.so
2837
lib/python%%XYDOT%%/lib-dynload/_datetime.so
2837
lib/python%%XYDOT%%/lib-dynload/_datetime.so
2838
lib/python%%XYDOT%%/lib-dynload/_dbm.so
2838
lib/python%%XYDOT%%/lib-dynload/_dbm.so
2839
lib/python%%XYDOT%%/lib-dynload/_decimal.so
2839
%%NO_LIBMPDEC%%lib/python%%XYDOT%%/lib-dynload/_decimal.so
2840
lib/python%%XYDOT%%/lib-dynload/_elementtree.so
2840
lib/python%%XYDOT%%/lib-dynload/_elementtree.so
2841
lib/python%%XYDOT%%/lib-dynload/_hashlib.so
2841
lib/python%%XYDOT%%/lib-dynload/_hashlib.so
2842
lib/python%%XYDOT%%/lib-dynload/_heapq.so
2842
lib/python%%XYDOT%%/lib-dynload/_heapq.so

Return to bug 253604