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" ];