From c11abc4ea169b75c7d8021d13e87e45cdbec8eb0 Mon Sep 17 00:00:00 2001 From: ajanicijamd Date: Thu, 1 Aug 2024 16:37:06 -0400 Subject: [PATCH] Fix compilation with GCC 13 and Ubuntu 24.04 (#362) * Modified submodules dyninst and timemory. * Modified PAPI submodule to fix GCC 13 build for Ubuntu 24.04. * Updated PAPI submodule URL. * Fixed papi submodule URL. * Using latest tag (papi-7-1-0-t) for papi submodule. * Update submodule dyninst to new version * Added a mirror to elfutils --- .gitmodules | 2 +- cmake/ElfUtils.cmake | 1 + external/dyninst | 2 +- external/papi | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 69f9de16c6..0e2f857b06 100644 --- a/.gitmodules +++ b/.gitmodules @@ -18,7 +18,7 @@ url = https://github.com/kokkos/kokkos.git [submodule "external/papi"] path = external/papi - url = https://bitbucket.org/icl/papi.git + url = https://github.com/icl-utk-edu/papi.git [submodule "external/pybind11"] path = external/pybind11 url = https://github.com/jrmadsen/pybind11.git diff --git a/cmake/ElfUtils.cmake b/cmake/ElfUtils.cmake index f58cf0eed5..df6a9a99ca 100644 --- a/cmake/ElfUtils.cmake +++ b/cmake/ElfUtils.cmake @@ -104,6 +104,7 @@ externalproject_add( PREFIX ${PROJECT_BINARY_DIR}/external/elfutils URL ${ElfUtils_DOWNLOAD_URL} "https://sourceware.org/elfutils/ftp/${ElfUtils_DOWNLOAD_VERSION}/elfutils-${ElfUtils_DOWNLOAD_VERSION}.tar.bz2" + "https://mirrors.kernel.org/sourceware/elfutils/${ElfUtils_DOWNLOAD_VERSION}/elfutils-${ElfUtils_DOWNLOAD_VERSION}.tar.bz2" BUILD_IN_SOURCE 1 CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env CC=${ElfUtils_C_COMPILER} diff --git a/external/dyninst b/external/dyninst index 1ed7d85507..3d1942dee7 160000 --- a/external/dyninst +++ b/external/dyninst @@ -1 +1 @@ -Subproject commit 1ed7d855078f432f27c4e025c605290364f8f37c +Subproject commit 3d1942dee70a0008a7bb9e5f18d8b4abc0a91290 diff --git a/external/papi b/external/papi index effd1ef4e0..3ce9001dff 160000 --- a/external/papi +++ b/external/papi @@ -1 +1 @@ -Subproject commit effd1ef4e0fd4b80e36546791277215a2d6b9eba +Subproject commit 3ce9001dff49e1b6b1653ffb429808795f71a0bd