summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Watt <jpewhacker@gmail.com>2019-06-27 08:53:17 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-06-28 13:28:38 +0100
commitf473728b223c1de86aed870e05db1bc59068e113 (patch)
tree40a03a8d3b10eb26c741a0e3ff872cace9e3597d
parent275e3c8718f3216d00b9e5c6ff50dca2e73be4dd (diff)
downloadpoky-f473728b223c1de86aed870e05db1bc59068e113.tar.gz
python3: Fix .pyc file reproduciblility
Applies a patch to python that makes the pre-compiled .pyc files generated during the build reproducible. (From OE-Core rev: 148d54f91f43147f31b16a7c2cb1ade385832366) Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/python/python3/0001-Use-FLAG_REF-always-for-interned-strings.patch35
-rw-r--r--meta/recipes-devtools/python/python3_3.7.3.bb1
2 files changed, 36 insertions, 0 deletions
diff --git a/meta/recipes-devtools/python/python3/0001-Use-FLAG_REF-always-for-interned-strings.patch b/meta/recipes-devtools/python/python3/0001-Use-FLAG_REF-always-for-interned-strings.patch
new file mode 100644
index 0000000000..8fcb344222
--- /dev/null
+++ b/meta/recipes-devtools/python/python3/0001-Use-FLAG_REF-always-for-interned-strings.patch
@@ -0,0 +1,35 @@
1From 6c8ea7c1dacd42f3ba00440231ec0e6b1a38300d Mon Sep 17 00:00:00 2001
2From: Inada Naoki <songofacandy@gmail.com>
3Date: Sat, 14 Jul 2018 00:46:11 +0900
4Subject: [PATCH] Use FLAG_REF always for interned strings
5
6Upstream-status: Submitted [https://github.com/python/cpython/pull/8226]
7Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
8---
9 Python/marshal.c | 9 +++++++--
10 1 file changed, 7 insertions(+), 2 deletions(-)
11
12diff --git a/Python/marshal.c b/Python/marshal.c
13index 6d06266c6a..51db2e3b2e 100644
14--- a/Python/marshal.c
15+++ b/Python/marshal.c
16@@ -275,9 +275,14 @@ w_ref(PyObject *v, char *flag, WFILE *p)
17 if (p->version < 3 || p->hashtable == NULL)
18 return 0; /* not writing object references */
19
20- /* if it has only one reference, it definitely isn't shared */
21- if (Py_REFCNT(v) == 1)
22+ /* If it has only one reference, it definitely isn't shared.
23+ * But we use TYPE_REF always for interned string, to PYC file stable
24+ * as possible.
25+ */
26+ if (Py_REFCNT(v) == 1 &&
27+ !(PyUnicode_CheckExact(v) && PyUnicode_CHECK_INTERNED(v))) {
28 return 0;
29+ }
30
31 entry = _Py_HASHTABLE_GET_ENTRY(p->hashtable, v);
32 if (entry != NULL) {
33--
342.21.0
35
diff --git a/meta/recipes-devtools/python/python3_3.7.3.bb b/meta/recipes-devtools/python/python3_3.7.3.bb
index 3409d94ba0..573624528d 100644
--- a/meta/recipes-devtools/python/python3_3.7.3.bb
+++ b/meta/recipes-devtools/python/python3_3.7.3.bb
@@ -26,6 +26,7 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \
26 file://0001-bpo-36852-proper-detection-of-mips-architecture-for-.patch \ 26 file://0001-bpo-36852-proper-detection-of-mips-architecture-for-.patch \
27 file://crosspythonpath.patch \ 27 file://crosspythonpath.patch \
28 file://reformat_sysconfig.py \ 28 file://reformat_sysconfig.py \
29 file://0001-Use-FLAG_REF-always-for-interned-strings.patch \
29 " 30 "
30 31
31SRC_URI_append_class-native = " \ 32SRC_URI_append_class-native = " \