python3: cleanup

This commit is contained in:
Fredrik Rinnestam 2020-07-24 11:49:12 +02:00
parent 97ec8c637f
commit 7caf8d8ef1
3 changed files with 3 additions and 50 deletions

View File

@ -1,6 +1,5 @@
untrusted comment: verify with /etc/ports/core.pub
RWRJc1FUaeVeqkuualt/6507aNTIu788Mpg9Zk+tB8YUKrJ3PpYsYYy44NoOESMxR5C6CPsvpJ8UvN1xsDaHio4fJY2sGD+oOAU=
SHA256 (Pkgfile) = 19f06f462955e9087a074ce3d9359b4421931055fb658d82950b2d15b7bb461a
RWRJc1FUaeVeqgDThGbdqJaz0XsdTeOSx5Iq3UE4Wg24H4/B12/E73Ld0DzBQC9+5mRKy7Fo5zfUw7LfnPojyk2+cE+befrcVA0=
SHA256 (Pkgfile) = bb76b47e535f1f60ebaf55c16204be2cf668915a27560572d36b4658dbaf76b9
SHA256 (.footprint) = ff4b2cc43f515127aa19283cf48c3be6f23ee5379f0741e0e7c18ec990649215
SHA256 (Python-3.8.5.tar.xz) = e3003ed57db17e617acb382b0cade29a248c6026b1bd8aad1f976e9af66a83b0
SHA256 (mpdecimal-2.5.patch) = 3a72812cb774610dea8abcac9ebe79d4e2ee3eb3d12be529a9865483dd9379db

View File

@ -6,14 +6,11 @@
name=python3
version=3.8.5
release=1
source=(https://www.python.org/ftp/python/$version/Python-$version.tar.xz
mpdecimal-2.5.patch)
source=(https://www.python.org/ftp/python/$version/Python-$version.tar.xz)
build() {
cd Python-$version
#patch -p1 -i $SRC/mpdecimal-2.5.patch
# Ensure that we are using the system copy of various libraries
rm -r Modules/expat
rm -r Modules/_ctypes/{darwin,libffi}*

View File

@ -1,43 +0,0 @@
From 16eea45fbd3b7c3d1b222b7eb7a5d7ee427f70bd Mon Sep 17 00:00:00 2001
From: Felix Yan <felixonmars@archlinux.org>
Date: Thu, 16 Jul 2020 04:22:23 +0800
Subject: [PATCH] [3.8] bpo-41302: Support system libmpdec 2.5 for Python 3.8
(GH-21488)
Define UNUSED only when mpdecimal.h doesn't define it. This would support
building with system libmpdec 2.5 while retaining compatibility with system
libmpdec 2.4 or the vendored copy.
Tested to build fine with either system libmpdec or the vendored one.
---
.../next/Build/2020-07-15-17-56-32.bpo-41302.S3o-x9.rst | 1 +
Modules/_decimal/_decimal.c | 7 +++++++
2 files changed, 8 insertions(+)
create mode 100644 Misc/NEWS.d/next/Build/2020-07-15-17-56-32.bpo-41302.S3o-x9.rst
diff --git a/Misc/NEWS.d/next/Build/2020-07-15-17-56-32.bpo-41302.S3o-x9.rst b/Misc/NEWS.d/next/Build/2020-07-15-17-56-32.bpo-41302.S3o-x9.rst
new file mode 100644
index 0000000000000..2f1301740e748
--- /dev/null
+++ b/Misc/NEWS.d/next/Build/2020-07-15-17-56-32.bpo-41302.S3o-x9.rst
@@ -0,0 +1 @@
+Enable building Python 3.8 with libmpdec-2.5.0 to ease maintenance for Linux distributions. Patch by Felix Yan.
\ No newline at end of file
diff --git a/Modules/_decimal/_decimal.c b/Modules/_decimal/_decimal.c
index df7c6e254bcf2..eb1f1a01feeca 100644
--- a/Modules/_decimal/_decimal.c
+++ b/Modules/_decimal/_decimal.c
@@ -58,6 +58,13 @@
#define BOUNDS_CHECK(x, MIN, MAX) x = (x < MIN || MAX < x) ? MAX : x
+#ifndef UNUSED
+#if defined(__GNUC__) && !defined(__INTEL_COMPILER)
+ #define UNUSED __attribute__((unused))
+#else
+ #define UNUSED
+#endif
+#endif
/* _Py_DEC_MINALLOC >= MPD_MINALLOC */
#define _Py_DEC_MINALLOC 4