Attachment 222538 Details for Bug 253601 – build --with-system-libmpdec

[patch] build --with-system-libmpdec

python37.diff (text/plain), 3.65 KB, created by Stefan Krah on 2021-02-17 22:05:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Krah

Created: 2021-02-17 22:05:32 UTC

Size: 3.65 KB

patch

obsolete

>Index: python37/Makefile
>===================================================================
>--- python37/Makefile	(revision 565458)
>+++ python37/Makefile	(working copy)
>@@ -15,7 +15,7 @@
> 
> LICENSE=	PSFL
> 
>-LIB_DEPENDS=	libffi.so:devel/libffi
>+LIB_DEPENDS=	libffi.so:devel/libffi libmpdec.so:math/mpdecimal
> 
> USES=		cpe ncurses pathfix pkgconfig readline:port shebangfix ssl tar:xz
> PATHFIX_MAKEFILEIN=	Makefile.pre.in
>@@ -31,7 +31,7 @@
> 
> DISABLED_EXTENSIONS=	_sqlite3 _tkinter _gdbm
> CONFIGURE_ARGS+=	--enable-shared --without-ensurepip \
>-			--with-system-ffi
>+			--with-system-ffi --with-system-libmpdec
> CONFIGURE_ENV+=		OPT="" DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS}"	# Null out OPT to respect user CFLAGS and remove optimizations
> 
> INSTALL_TARGET=		altinstall						# Don't want cloberring of unprefixed files
>Index: python37/files/patch-Modules___decimal___decimal.c
>===================================================================
>--- python37/files/patch-Modules___decimal___decimal.c	(nonexistent)
>+++ python37/files/patch-Modules___decimal___decimal.c	(working copy)
>@@ -0,0 +1,32 @@
>+--- Modules/_decimal/_decimal.c.orig	2021-02-17 21:21:24 UTC
>++++ Modules/_decimal/_decimal.c
>+@@ -58,6 +58,11 @@
>+ 
>+ #define BOUNDS_CHECK(x, MIN, MAX) x = (x < MIN || MAX < x) ? MAX : x
>+ 
>++#if defined(__GNUC__) && !defined(__INTEL_COMPILER)
>++  #define UNUSED __attribute__((unused))
>++#else
>++  #define UNUSED
>++#endif
>+ 
>+ /* _Py_DEC_MINALLOC >= MPD_MINALLOC */
>+ #define _Py_DEC_MINALLOC 4
>+@@ -3277,7 +3282,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) {
>+@@ -3286,7 +3291,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: python37/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: python37/files/patch-setup.py
>===================================================================
>--- python37/files/patch-setup.py	(nonexistent)
>+++ python37/files/patch-setup.py	(working copy)
>@@ -0,0 +1,11 @@
>+--- setup.py.orig	2021-02-17 21:21:03 UTC
>++++ setup.py
>+@@ -2057,7 +2057,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: python37/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 253601: 222538