2 files changed, 28 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/rocprofiler-dev/fix-includes.patch b/var/spack/repos/builtin/packages/rocprofiler-dev/fix-includes.patch
new file mode 100644
index 0000000000..c4a9dc1097
--- /dev/null
+++ b/var/spack/repos/builtin/packages/rocprofiler-dev/fix-includes.patch
@@ -0,0 +1,25 @@
+From 9b7edb39207cb040093ffdd7d99c9d6e56807c95 Mon Sep 17 00:00:00 2001
+From: Harmen Stoppels <harmenstoppels@gmail.com>
+Date: Wed, 21 Jul 2021 12:00:52 +0200
+Subject: [PATCH] C to C++ includes, fix build issue with gcc 9
+
+---
+ test/ctrl/test_kernel.h | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/test/ctrl/test_kernel.h b/test/ctrl/test_kernel.h
+index 95da162..596d029 100644
+--- a/test/ctrl/test_kernel.h
++++ b/test/ctrl/test_kernel.h
+@@ -23,8 +23,9 @@ THE SOFTWARE.
+ #ifndef TEST_CTRL_TEST_KERNEL_H_
+ #define TEST_CTRL_TEST_KERNEL_H_
+ 
+-#include <string.h>
+-#include <stdint.h>
++#include <string>
++#include <cstdlib>
++#include <cstdint>
+ #include <map>
+ 
+ // Class implements kernel test
diff --git a/var/spack/repos/builtin/packages/rocprofiler-dev/package.py b/var/spack/repos/builtin/packages/rocprofiler-dev/package.py
index b1a74d2b00..2437cb4d9c 100644
--- a/var/spack/repos/builtin/packages/rocprofiler-dev/package.py
+++ b/var/spack/repos/builtin/packages/rocprofiler-dev/package.py
@@ -32,6 +32,9 @@ class RocprofilerDev(CMakePackage):
         depends_on('hsa-rocr-dev@' + ver, when='@' + ver)
         depends_on('rocminfo@' + ver, when='@' + ver)
 
+    # See https://github.com/ROCm-Developer-Tools/rocprofiler/pull/50
+    patch('fix-includes.patch')
+
     resource(name='roctracer-dev',
              url='https://github.com/ROCm-Developer-Tools/roctracer/archive/rocm-3.5.0.tar.gz',
              sha256='7af5326c9ca695642b4265232ec12864a61fd6b6056aa7c4ecd9e19c817f209e',