diff options
| -rw-r--r-- | var/spack/repos/builtin/packages/gdb/package.py | 48 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/python/package.py | 7 |
2 files changed, 39 insertions, 16 deletions
diff --git a/var/spack/repos/builtin/packages/gdb/package.py b/var/spack/repos/builtin/packages/gdb/package.py index 90146da14e..ed5f87d51f 100644 --- a/var/spack/repos/builtin/packages/gdb/package.py +++ b/var/spack/repos/builtin/packages/gdb/package.py @@ -4,6 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) from spack import * +import os class Gdb(AutotoolsPackage, GNUMirrorPackage): @@ -15,22 +16,25 @@ class Gdb(AutotoolsPackage, GNUMirrorPackage): homepage = "https://www.gnu.org/software/gdb" gnu_mirror_path = "gdb/gdb-7.10.tar.gz" - version('9.2', sha256='38ef247d41ba7cc3f6f93a612a78bab9484de9accecbe3b0150a3c0391a3faf0') - version('9.1', sha256='fcda54d4f35bc53fb24b50009a71ca98410d71ff2620942e3c829a7f5d614252') - version('8.3.1', sha256='26ce655216cd03f4611518a7a1c31d80ec8e884c16715e9ba8b436822e51434b') - version('8.3', sha256='b2266ec592440d0eec18ee1790f8558b3b8a2845b76cc83a872e39b501ce8a28') - version('8.2.1', sha256='0107985f1edb8dddef6cdd68a4f4e419f5fec0f488cc204f0b7d482c0c6c9282') - version('8.2', sha256='847e4b65e5a7b872e86019dd59659029e2b06cae962e0ef345f169dcb4b851b8') - version('8.1', sha256='e54a2322da050e4b00785370a282b9b8f0b25861ec7cfbbce0115e253eea910e') - version('8.0.1', sha256='52017d33cab5b6a92455a1a904046d075357abf24153470178c0aadca2d479c5') - version('8.0', sha256='8968a19e14e176ee026f0ca777657c43456514ad41bb2bc7273e8c4219555ac9') + maintainers = ['robertu94'] + + version('10.1', sha256='f12f388b99e1408c01308c3f753313fafa45517740c81ab7ed0d511b13e2cf55') + version('9.2', sha256='38ef247d41ba7cc3f6f93a612a78bab9484de9accecbe3b0150a3c0391a3faf0') + version('9.1', sha256='fcda54d4f35bc53fb24b50009a71ca98410d71ff2620942e3c829a7f5d614252') + version('8.3.1', sha256='26ce655216cd03f4611518a7a1c31d80ec8e884c16715e9ba8b436822e51434b') + version('8.3', sha256='b2266ec592440d0eec18ee1790f8558b3b8a2845b76cc83a872e39b501ce8a28') + version('8.2.1', sha256='0107985f1edb8dddef6cdd68a4f4e419f5fec0f488cc204f0b7d482c0c6c9282') + version('8.2', sha256='847e4b65e5a7b872e86019dd59659029e2b06cae962e0ef345f169dcb4b851b8') + version('8.1', sha256='e54a2322da050e4b00785370a282b9b8f0b25861ec7cfbbce0115e253eea910e') + version('8.0.1', sha256='52017d33cab5b6a92455a1a904046d075357abf24153470178c0aadca2d479c5') + version('8.0', sha256='8968a19e14e176ee026f0ca777657c43456514ad41bb2bc7273e8c4219555ac9') version('7.12.1', sha256='142057eacecfb929d52b561eb47a1103c7d504cec3f659dd8a5ae7bc378f7e77') - version('7.11', sha256='9382f5534aa0754169e1e09b5f1a3b77d1fa8c59c1e57617e06af37cb29c669a') + version('7.11', sha256='9382f5534aa0754169e1e09b5f1a3b77d1fa8c59c1e57617e06af37cb29c669a') version('7.10.1', sha256='ff14f8050e6484508c73cbfa63731e57901478490ca1672dc0b5e2b03f6af622') - version('7.10', sha256='50690e6d6b7917a6544190ec9401eaafb555e3cef8981709ea9870296c383ce5') - version('7.9.1', sha256='4994ad986726ac4128a6f1bd8020cd672e9a92aa76b80736563ef992992764ef') - version('7.9', sha256='d282508cb7df0cb8b2cf659032ce1bede7b5725796e3ac90f3cd9d65844a65f2') - version('7.8.2', sha256='fd9a9784ca24528aac8a4e6b8d7ae7e8cf0784e128cd67a185c986deaf6b9929') + version('7.10', sha256='50690e6d6b7917a6544190ec9401eaafb555e3cef8981709ea9870296c383ce5') + version('7.9.1', sha256='4994ad986726ac4128a6f1bd8020cd672e9a92aa76b80736563ef992992764ef') + version('7.9', sha256='d282508cb7df0cb8b2cf659032ce1bede7b5725796e3ac90f3cd9d65844a65f2') + version('7.8.2', sha256='fd9a9784ca24528aac8a4e6b8d7ae7e8cf0784e128cd67a185c986deaf6b9929') variant('python', default=True, description='Compile with Python support') variant('xz', default=True, description='Compile with lzma support') @@ -45,7 +49,7 @@ class Gdb(AutotoolsPackage, GNUMirrorPackage): depends_on('texinfo', type='build') # Optional dependencies - depends_on('python', when='+python') + depends_on('python+debug', when='+python', type=('build', 'link', 'run')) depends_on('xz', when='+xz') depends_on('source-highlight', when='+source-highlight') depends_on('ncurses', when='+tui') @@ -53,7 +57,10 @@ class Gdb(AutotoolsPackage, GNUMirrorPackage): build_directory = 'spack-build' def configure_args(self): - args = [] + args = [ + '--with-system-gdbinit={0}'.format(self.prefix.etc.gdbinit) + ] + if '+python' in self.spec: args.append('--with-python') args.append('LDFLAGS={0}'.format( @@ -75,3 +82,12 @@ class Gdb(AutotoolsPackage, GNUMirrorPackage): args.append('--enable-tui') return args + + @run_after('install') + def gdbinit(self): + if '+python' in self.spec: + tool = self.spec['python'].command.path + '-gdb.py' + if os.path.exists(tool): + mkdir(self.prefix.etc) + with open(self.prefix.etc.gdbinit, 'w') as gdbinit: + gdbinit.write('add-auto-load-safe-path {0}\n'.format(tool)) diff --git a/var/spack/repos/builtin/packages/python/package.py b/var/spack/repos/builtin/packages/python/package.py index 87ef6de7f9..d9a152e5d0 100644 --- a/var/spack/repos/builtin/packages/python/package.py +++ b/var/spack/repos/builtin/packages/python/package.py @@ -620,6 +620,13 @@ class Python(AutotoolsPackage): os.path.join(prefix.bin, 'python-config')) @run_after('install') + def install_python_gdb(self): + # https://devguide.python.org/gdb/ + src = os.path.join('Tools', 'gdb', 'libpython.py') + if os.path.exists(src): + install(src, self.command.path + '-gdb.py') + + @run_after('install') @on_package_attributes(run_tests=True) def import_tests(self): """Test that basic Python functionality works.""" |