diff options
| author | Michael Kuhn <michael.kuhn@informatik.uni-hamburg.de> | 2020-05-15 03:10:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-14 20:10:58 -0500 |
| commit | 5875bc6d6b635714b0e8c9b536d623077a417c74 (patch) | |
| tree | c53cd237079f940f3cc6feaac823cba23ece5f0e /var | |
| parent | e21b4731a97fe79a34d80b52fa4ad089ad70ac74 (diff) | |
| download | spack-5875bc6d6b635714b0e8c9b536d623077a417c74.tar.gz spack-5875bc6d6b635714b0e8c9b536d623077a417c74.tar.bz2 spack-5875bc6d6b635714b0e8c9b536d623077a417c74.tar.xz spack-5875bc6d6b635714b0e8c9b536d623077a417c74.zip | |
scorep: Fix build with gcc@10: (#16642)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/scorep/gcc10.patch | 14 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/scorep/package.py | 3 |
2 files changed, 16 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/scorep/gcc10.patch b/var/spack/repos/builtin/packages/scorep/gcc10.patch new file mode 100644 index 0000000000..76bcb987ca --- /dev/null +++ b/var/spack/repos/builtin/packages/scorep/gcc10.patch @@ -0,0 +1,14 @@ +--- a/src/adapters/compiler/gcc-plugin/scorep_plugin_pass_instrument.inc.c ++++ b/src/adapters/compiler/gcc-plugin/scorep_plugin_pass_instrument.inc.c +@@ -83,7 +83,11 @@ is_instrumentable( const char* assemblerName ) + return "in system header"; + } + ++#if SCOREP_GCC_PLUGIN_TARGET_VERSION < 10000 + if ( node->global.inlined_to ) ++#else ++ if ( node->inlined_to ) ++#endif + { + return "was inlined"; + } diff --git a/var/spack/repos/builtin/packages/scorep/package.py b/var/spack/repos/builtin/packages/scorep/package.py index b26af4287d..d7b57c0c44 100644 --- a/var/spack/repos/builtin/packages/scorep/package.py +++ b/var/spack/repos/builtin/packages/scorep/package.py @@ -25,7 +25,8 @@ class Scorep(AutotoolsPackage): version('1.4.2', sha256='d7f3fcca2efeb2f5d5b5f183b3b2c4775e66cbb3400ea2da841dd0428713ebac') version('1.3', sha256='dcfd42bd05f387748eeefbdf421cb3cd98ed905e009303d70b5f75b217fd1254') - patch('gcc7.patch', when='@:3') + patch('gcc7.patch', when='@1.4:3') + patch('gcc10.patch', when='@3.1:') variant('mpi', default=True, description="Enable MPI support") variant('papi', default=True, description="Enable PAPI") |