Attachment 222541 Details for Bug 253604 – build --with-system-libmpdec

[patch] build --with-system-libmpdec

python39.diff (text/plain), 3.76 KB, created by Stefan Krah on 2021-02-17 22:10:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Krah

Created: 2021-02-17 22:10:09 UTC

Size: 3.76 KB

patch

obsolete

>Index: python39/Makefile
>===================================================================
>--- python39/Makefile	(revision 565458)
>+++ python39/Makefile	(working copy)
>@@ -50,13 +50,14 @@
> 			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 +74,9 @@
> 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
>Index: python39/files/patch-Modules___decimal___decimal.c
>===================================================================
>--- python39/files/patch-Modules___decimal___decimal.c	(nonexistent)
>+++ python39/files/patch-Modules___decimal___decimal.c	(working copy)
>@@ -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) {
>
>Property changes on: python39/files/patch-Modules___decimal___decimal.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: python39/files/patch-setup.py
>===================================================================
>--- python39/files/patch-setup.py	(nonexistent)
>+++ python39/files/patch-setup.py	(working copy)
>@@ -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:
>
>Property changes on: python39/files/patch-setup.py
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

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