69 lines
1.9 KiB
Diff
69 lines
1.9 KiB
Diff
From FEDORA_PATCHES Mon Sep 17 00:00:00 2001
|
|
From: Paul Koning <paul_koning@dell.com>
|
|
Date: Fri, 8 Jun 2018 13:26:36 -0400
|
|
Subject: gdb-fix-python37-breakage.patch
|
|
|
|
FileName: gdb-fix-python37-breakage.patch
|
|
|
|
;; Fix build breakage with Python 3.7
|
|
;; RHBZ #1577396
|
|
|
|
Fix build issue with Python 3.7
|
|
|
|
Originally reported in
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=1577396 -- gdb build fails
|
|
with Python 3.7 due to references to a Python internal function whose
|
|
declaration changed in 3.7.
|
|
|
|
gdb/ChangeLog
|
|
2018-06-08 Paul Koning <paul_koning@dell.com>
|
|
|
|
PR gdb/23252
|
|
|
|
* python/python.c (do_start_initialization):
|
|
Avoid call to internal Python API.
|
|
(init__gdb_module): New function.
|
|
|
|
diff --git a/gdb/python/python.c b/gdb/python/python.c
|
|
--- a/gdb/python/python.c
|
|
+++ b/gdb/python/python.c
|
|
@@ -1810,6 +1810,17 @@ finalize_python (void *ignore)
|
|
restore_active_ext_lang (previous_active);
|
|
}
|
|
|
|
+#ifdef IS_PY3K
|
|
+/* This is called via the PyImport_AppendInittab mechanism called
|
|
+ during initialization, to make the built-in _gdb module known to
|
|
+ Python. */
|
|
+PyMODINIT_FUNC
|
|
+init__gdb_module (void)
|
|
+{
|
|
+ return PyModule_Create (&python_GdbModuleDef);
|
|
+}
|
|
+#endif
|
|
+
|
|
static bool
|
|
do_start_initialization ()
|
|
{
|
|
@@ -1850,6 +1861,9 @@ do_start_initialization ()
|
|
remain alive for the duration of the program's execution, so
|
|
it is not freed after this call. */
|
|
Py_SetProgramName (progname_copy);
|
|
+
|
|
+ /* Define _gdb as a built-in module. */
|
|
+ PyImport_AppendInittab ("_gdb", init__gdb_module);
|
|
#else
|
|
Py_SetProgramName (progname.release ());
|
|
#endif
|
|
@@ -1859,9 +1873,7 @@ do_start_initialization ()
|
|
PyEval_InitThreads ();
|
|
|
|
#ifdef IS_PY3K
|
|
- gdb_module = PyModule_Create (&python_GdbModuleDef);
|
|
- /* Add _gdb module to the list of known built-in modules. */
|
|
- _PyImport_FixupBuiltin (gdb_module, "_gdb");
|
|
+ gdb_module = PyImport_ImportModule ("_gdb");
|
|
#else
|
|
gdb_module = Py_InitModule ("_gdb", python_GdbMethods);
|
|
#endif
|