[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
23/24: gnu: gdb: Fix build with Python >= 3.7.
From: |
Marius Bakke |
Subject: |
23/24: gnu: gdb: Fix build with Python >= 3.7. |
Date: |
Sat, 28 Jul 2018 09:58:19 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit fc8778e2934e623b4cfae253942a721cea42a43b
Author: Marius Bakke <address@hidden>
Date: Tue Jul 24 01:09:39 2018 +0200
gnu: gdb: Fix build with Python >= 3.7.
* gnu/packages/patches/gdb-python-3.7.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/gdb.scm (gdb)[source](patches): New field.
---
gnu/local.mk | 1 +
gnu/packages/gdb.scm | 1 +
gnu/packages/patches/gdb-python-3.7.patch | 52 +++++++++++++++++++++++++++++++
3 files changed, 54 insertions(+)
diff --git a/gnu/local.mk b/gnu/local.mk
index e2bdd47..b8189eb 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -709,6 +709,7 @@ dist_patch_DATA =
\
%D%/packages/patches/gd-CVE-2018-5711.patch \
%D%/packages/patches/gd-fix-tests-on-i686.patch \
%D%/packages/patches/gd-freetype-test-failure.patch \
+ %D%/packages/patches/gdb-python-3.7.patch \
%D%/packages/patches/gemma-intel-compat.patch \
%D%/packages/patches/geoclue-config.patch \
%D%/packages/patches/ghc-8.0-fall-back-to-madv_dontneed.patch \
diff --git a/gnu/packages/gdb.scm b/gnu/packages/gdb.scm
index 36ccb79..4c47cc5 100644
--- a/gnu/packages/gdb.scm
+++ b/gnu/packages/gdb.scm
@@ -42,6 +42,7 @@
(method url-fetch)
(uri (string-append "mirror://gnu/gdb/gdb-"
version ".tar.xz"))
+ (patches (search-patches "gdb-python-3.7.patch"))
(sha256
(base32
"0d2bpqk58fqlx21rbnk8mbcjlggzc9kb5sjirrfrrrjq70ka0qdg"))))
diff --git a/gnu/packages/patches/gdb-python-3.7.patch
b/gnu/packages/patches/gdb-python-3.7.patch
new file mode 100644
index 0000000..c51442c
--- /dev/null
+++ b/gnu/packages/patches/gdb-python-3.7.patch
@@ -0,0 +1,52 @@
+Fix build failure with Python 3.7 and newer.
+
+Taken from this upstream commit, sans ChangeLog update:
+
+https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=aeab512851bf6ed623d1c6c4305b6ce05e51a10c
+
+diff --git a/gdb/python/python.c b/gdb/python/python.c
+index 1805c90..20fc674 100644
+--- a/gdb/python/python.c
++++ b/gdb/python/python.c
+@@ -1667,6 +1667,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 ()
+ {
+@@ -1707,6 +1718,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
+@@ -1716,9 +1730,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
+--
+2.9.3
+
- 10/24: gnu: python-py: Update to 1.5.4., (continued)
- 10/24: gnu: python-py: Update to 1.5.4., Marius Bakke, 2018/07/28
- 11/24: gnu: python-py: Update home page., Marius Bakke, 2018/07/28
- 17/24: gnu: python-flake8: Update to 3.5.0., Marius Bakke, 2018/07/28
- 07/24: gnu: python: Rebuild bytecode after removing tests., Marius Bakke, 2018/07/28
- 05/24: gnu: python: Remove outdated comment and phases., Marius Bakke, 2018/07/28
- 06/24: gnu: python: Update to 3.7.0., Marius Bakke, 2018/07/28
- 12/24: gnu: python-pyflakes: Update to 2.0.0., Marius Bakke, 2018/07/28
- 13/24: gnu: python-more-itertools: Update to 4.2.0., Marius Bakke, 2018/07/28
- 19/24: gnu: python-pytest-cov: Update to 2.5.1., Marius Bakke, 2018/07/28
- 24/24: gnu: python-fonttools: Update to 3.28.0., Marius Bakke, 2018/07/28
- 23/24: gnu: gdb: Fix build with Python >= 3.7.,
Marius Bakke <=
- 18/24: gnu: python-hypothesis: Update to 3.66.6., Marius Bakke, 2018/07/28
- 22/24: gnu: python-pytest-mock: Update to 1.10.0., Marius Bakke, 2018/07/28
- 20/24: gnu: Add python-invoke., Marius Bakke, 2018/07/28
- 09/24: gnu: python-py: Add missing dependency on setuptools-scm., Marius Bakke, 2018/07/28
- 15/24: gnu: python-setuptools: Update to 40.0.0., Marius Bakke, 2018/07/28
- 14/24: gnu: python-pycodestyle: Update to 2.4.0., Marius Bakke, 2018/07/28
- 16/24: gnu: python-pytest-runner: Update to 4.2., Marius Bakke, 2018/07/28
- 21/24: gnu: python-pytest: Update to 3.6.3., Marius Bakke, 2018/07/28