hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

scorep: Fix build with gcc@10: (#16642)

Browse source
This commit is contained in:
Michael Kuhn 2020-05-15 03:10:58 +02:00 committed by GitHub
parent e21b4731a9
commit 5875bc6d6b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
var/spack/repos/builtin/packages/scorep/gcc10.patch Normal file
View file

@ -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";
}

3
var/spack/repos/builtin/packages/scorep/package.py
View file

@ -25,7 +25,8 @@ class Scorep(AutotoolsPackage):
version('1.4.2', sha256='d7f3fcca2efeb2f5d5b5f183b3b2c4775e66cbb3400ea2da841dd0428713ebac') version('1.4.2', sha256='d7f3fcca2efeb2f5d5b5f183b3b2c4775e66cbb3400ea2da841dd0428713ebac')
version('1.3', sha256='dcfd42bd05f387748eeefbdf421cb3cd98ed905e009303d70b5f75b217fd1254') 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('mpi', default=True, description="Enable MPI support")
variant('papi', default=True, description="Enable PAPI") variant('papi', default=True, description="Enable PAPI")