From 4b5a948918929fbc5cd38e83653c3d757427d7e2 Mon Sep 17 00:00:00 2001
From: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>
Date: Thu, 2 Mar 2023 12:03:12 +0100
Subject: [PATCH] Add PTR patch to Extrae

---
 bsc/extrae/PTR.patch   | 13 +++++++++++++
 bsc/extrae/default.nix | 12 ++++++++----
 2 files changed, 21 insertions(+), 4 deletions(-)
 create mode 100644 bsc/extrae/PTR.patch

diff --git a/bsc/extrae/PTR.patch b/bsc/extrae/PTR.patch
new file mode 100644
index 0000000..7b46282
--- /dev/null
+++ b/bsc/extrae/PTR.patch
@@ -0,0 +1,13 @@
+diff --git a/src/merger/common/bfd_manager.c b/src/merger/common/bfd_manager.c
+index 5f9dacf9..5231e3eb 100644
+--- a/src/merger/common/bfd_manager.c
++++ b/src/merger/common/bfd_manager.c
+@@ -225,7 +225,7 @@ asymbol **BFDmanager_getDefaultSymbols (void)
+  *
+  * @return No return value.
+  */
+-static void BFDmanager_findAddressInSection (bfd * abfd, asection * section, PTR data)
++static void BFDmanager_findAddressInSection (bfd * abfd, asection * section, void * data)
+ {
+ #if HAVE_BFD_GET_SECTION_SIZE || HAVE_BFD_SECTION_SIZE || HAVE_BFD_GET_SECTION_SIZE_BEFORE_RELOC
+ 	bfd_size_type size;
diff --git a/bsc/extrae/default.nix b/bsc/extrae/default.nix
index 26f7124..1f92de7 100644
--- a/bsc/extrae/default.nix
+++ b/bsc/extrae/default.nix
@@ -38,10 +38,14 @@ stdenv.mkDerivation rec {
     sha256 = "SlMYxNQXJ0Xg90HmpnotUR3tEPVVBXhk1NtEBJwGBR4=";
   };
 
-  # FIXME: Waiting for German to merge this patch. Still not in master, merged
-  # on 2023-03-01 in devel branch (after 3 years), see:
-  # https://github.com/bsc-performance-tools/extrae/pull/45
-  patches = [ ./use-command.patch ];
+  patches = [
+    # FIXME: Waiting for German to merge this patch. Still not in master, merged
+    # on 2023-03-01 in devel branch (after 3 years), see:
+    # https://github.com/bsc-performance-tools/extrae/pull/45
+    ./use-command.patch
+    # https://github.com/bsc-performance-tools/extrae/issues/71
+    ./PTR.patch
+  ];
 
   enableParallelBuilding = true;
   hardeningDisable = [ "all" ];