File openssl-300-prepare-hashtable-rename.patch of Package python36

Overview Repositories Revisions Requests Users Attributes Meta

File openssl-300-prepare-hashtable-rename.patch of Package python36

From 3e7679752e978eeede70ec3145afdba4c8a913a4 Mon Sep 17 00:00:00 2001
From: Victor Stinner <vstinner@python.org>
Date: Tue, 12 May 2020 02:42:19 +0200
Subject: [PATCH] OpenSSL 3.0.0: Rename hashtable.h to pycore_hashtable.h

* Move Modules/hashtable.c to Python/hashtable.c
* Python is now linked to hashtable.c. _tracemalloc is no longer
  linked to hashtable.c. Previously, marshal.c got hashtable.c via
  _tracemalloc.c which is built as a builtin module.

Fixes: bpo-40602
From-PR: gh#python/cpython!20044
Released-in: 3.9.0
Patch: openssl-300-prepare-hashtable-rename.patch
---
 Modules/Setup.dist              | 5 ++++-
 {Modules => Python}/hashtable.c | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)
 rename {Modules => Python}/hashtable.c (99%)

diff --git a/Modules/Setup.dist b/Modules/Setup.dist
index e469d5e4c8e..ebc80df8541 100644
--- a/Modules/Setup.dist
+++ b/Modules/Setup.dist
@@ -135,7 +135,10 @@ zipimport zipimport.c
 faulthandler faulthandler.c
 
 # debug tool to trace memory blocks allocated by Python
-_tracemalloc _tracemalloc.c hashtable.c
+#
+# bpo-35053: The module must be builtin since _Py_NewReference()
+# can call _PyTraceMalloc_NewReference().
+_tracemalloc _tracemalloc.c
 
 # The rest of the modules listed in this file are all commented out by
 # default.  Usually they can be detected and built as dynamically
diff --git a/Modules/hashtable.c b/Python/hashtable.c
similarity index 99%
rename from Modules/hashtable.c
rename to Python/hashtable.c
index 0547a6def2a..864860ee390 100644
--- a/Modules/hashtable.c
+++ b/Python/hashtable.c
@@ -45,7 +45,7 @@
 */
 
 #include "Python.h"
-#include "hashtable.h"
+#include "../Modules/hashtable.h"
 
 #define HASHTABLE_MIN_SIZE 16
 #define HASHTABLE_HIGH 0.50
-- 
2.46.1

Places

File openssl-300-prepare-hashtable-rename.patch of Package python36

Places