From 8c6f4272fd64aaebac5008a7c25e988f7d44e678 Mon Sep 17 00:00:00 2001
From: Kevin Huck <khuck@cs.uoregon.edu>
Date: Mon, 14 Oct 2024 09:29:17 -0700
Subject: [PATCH 1/2] Fixing lldb call

---
 src/scripts/apex_exec | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/scripts/apex_exec b/src/scripts/apex_exec
index c9732729..a7e367ab 100755
--- a/src/scripts/apex_exec
+++ b/src/scripts/apex_exec
@@ -735,7 +735,7 @@ if [ $apple = 1 ]; then
         if [ $# -gt 1 ] ; then
             echo "settings set target.run-args ${*:2}" >> ${gdbcmds}
         fi
-        debugger="lldb -s ./.gdbcmds --"
+        debugger="lldb -s ${gdbcmds} --"
     else
         export DYLD_LIBRARY_PATH=${APEX_LD_LIBRARY_PATH}
         export DYLD_INSERT_LIBRARIES=${APEX_LD_PRELOAD}
@@ -882,6 +882,10 @@ if [[ "$long_metrics" == *"$delim"* ]]; then
 else
     #echo "${myrank} Executing with metrics: \"${APEX_PAPI_METRICS}\", writing to ${APEX_OUTPUT_FILE_PATH}"
     #echo "apex_exec executing: ${debugger} ${PARAMS}"
+    if [ "${verbose}" == "yes" ] ; then
+        echo "${gdbcmds}:"
+        cat ${gdbcmds}
+    fi
     ${debugger} ${PARAMS}
     retval=$?
     unset LD_PRELOAD

From 18236ff66a5adc404c996f0cb89026cd682ac280 Mon Sep 17 00:00:00 2001
From: Kevin Huck <khuck@cs.uoregon.edu>
Date: Tue, 3 Dec 2024 12:33:18 -0800
Subject: [PATCH 2/2] Adding header for otf2_listener Adding missing header
 when OpenCL and OTF2 support both enabled.

---
 src/apex/apex_opencl.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/apex/apex_opencl.cpp b/src/apex/apex_opencl.cpp
index 3ac252c8..57e85fd8 100644
--- a/src/apex/apex_opencl.cpp
+++ b/src/apex/apex_opencl.cpp
@@ -36,6 +36,9 @@
 #include <deque>
 #include <mutex>
 #include <condition_variable>
+#ifdef APEX_HAVE_OTF2
+#include "otf2_listener.hpp"
+#endif
 
 namespace apex {
 namespace opencl {