diff options
| author | Robert Underwood <robertu94@users.noreply.github.com> | 2021-06-28 09:16:28 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-28 07:16:28 -0600 |
| commit | 69d69cbc798356a014a992609928cf9e66480297 (patch) | |
| tree | c6fa3acf711ab6dc62a72ddf31c69d41f6313e4a /var | |
| parent | 2284007db95af06b694c35492d20a918508bdb2f (diff) | |
| download | spack-69d69cbc798356a014a992609928cf9e66480297.tar.gz spack-69d69cbc798356a014a992609928cf9e66480297.tar.bz2 spack-69d69cbc798356a014a992609928cf9e66480297.tar.xz spack-69d69cbc798356a014a992609928cf9e66480297.zip | |
GDB: resolve warnings about imp being deprecated (#24448)
This patch has already been accepted into gdb's trunk, we just adopting
it earlier here since it is small and gives a better user experience.
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/gdb/importlib.patch | 18 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/gdb/package.py | 4 |
2 files changed, 22 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/gdb/importlib.patch b/var/spack/repos/builtin/packages/gdb/importlib.patch new file mode 100644 index 0000000000..e0f8663674 --- /dev/null +++ b/var/spack/repos/builtin/packages/gdb/importlib.patch @@ -0,0 +1,18 @@ +diff --git a/gdb/python/lib/gdb/__init__.py b/gdb/python/lib/gdb/__init__.py +index 84ec728ea21..9a0e9891cc5 100644 +--- a/gdb/python/lib/gdb/__init__.py ++++ b/gdb/python/lib/gdb/__init__.py +@@ -18,8 +18,10 @@ import os + import sys + import _gdb + +-if sys.version_info[0] > 2: +- # Python 3 moved "reload" ++# Python 3 moved "reload" ++if sys.version_info >= (3, 4): ++ from importlib import reload ++elif sys.version_info[0] > 2: + from imp import reload + + from _gdb import * +-- diff --git a/var/spack/repos/builtin/packages/gdb/package.py b/var/spack/repos/builtin/packages/gdb/package.py index db46399edf..b14b3e7c1c 100644 --- a/var/spack/repos/builtin/packages/gdb/package.py +++ b/var/spack/repos/builtin/packages/gdb/package.py @@ -50,6 +50,10 @@ class Gdb(AutotoolsPackage, GNUMirrorPackage): # https://www.gnu.org/software/gettext/FAQ.html#integrating_undefined patch('gdb-libintl.patch', level=0, when='@10.1:') + # Silence warnings about imp being deprecated on new python versions + # https://sourceware.org/pipermail/gdb-patches/2021-February/176622.html + patch('importlib.patch', when="@8.3.1:10.2 ^python@3.4:") + # Required dependency depends_on('texinfo', type='build') |