From 3d10efc4113395aaf551b6ad0db8e4822fdedcd5 Mon Sep 17 00:00:00 2001
From: ajanicijamd <Aleksandar.Janicijevic@amd.com>
Date: Sun, 10 Nov 2024 13:33:57 -0500
Subject: [PATCH] Changed libdir for external libraries built with autotools
 (#24)

---
 .gitmodules          | 2 +-
 cmake/ElfUtils.cmake | 2 +-
 cmake/PAPI.cmake     | 1 +
 external/dyninst     | 2 +-
 external/timemory    | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 2aecf69e2e..2515e865b8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -9,7 +9,7 @@
 	url = https://github.com/jrmadsen/ELFIO.git
 [submodule "external/dyninst"]
 	path = external/dyninst
-	url = https://github.com/jrmadsen/dyninst.git
+	url = https://github.com/ROCm/dyninst.git
 [submodule "external/PTL"]
 	path = external/PTL
 	url = https://github.com/jrmadsen/PTL.git
diff --git a/cmake/ElfUtils.cmake b/cmake/ElfUtils.cmake
index 8a829557bc..15d46bae4a 100644
--- a/cmake/ElfUtils.cmake
+++ b/cmake/ElfUtils.cmake
@@ -112,7 +112,7 @@ externalproject_add(
         CXXFLAGS=-fPIC\ -O3\ -Wno-error=null-dereference
         [=[LDFLAGS=-Wl,-rpath='$$ORIGIN']=] <SOURCE_DIR>/configure --enable-install-elfh
         --prefix=${_eu_root} --disable-libdebuginfod --disable-debuginfod --disable-nls
-        --enable-thread-safety --enable-silent-rules
+        --enable-thread-safety --enable-silent-rules --libdir=${_eu_root}/lib
     BUILD_COMMAND ${MAKE_COMMAND} install -s
     BUILD_BYPRODUCTS "${_eu_build_byproducts}"
     INSTALL_COMMAND "")
diff --git a/cmake/PAPI.cmake b/cmake/PAPI.cmake
index 5d0d0f4506..7c9336696c 100644
--- a/cmake/PAPI.cmake
+++ b/cmake/PAPI.cmake
@@ -211,6 +211,7 @@ externalproject_add(
         --prefix=${ROCPROFSYS_PAPI_INSTALL_DIR} --with-static-lib=yes --with-shared-lib=no
         --with-perf-events --with-tests=no
         --with-components=${_ROCPROFSYS_PAPI_COMPONENTS}
+        --libdir=${ROCPROFSYS_PAPI_INSTALL_DIR}/lib
     CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env CFLAGS=-fPIC\ -O3\ -Wno-stringop-truncation
                       ${ROCPROFSYS_PAPI_EXTRA_ENV} ${MAKE_EXECUTABLE} static install -s
     BUILD_COMMAND ${CMAKE_COMMAND} -E env CFLAGS=-fPIC\ -O3\ -Wno-stringop-truncation
diff --git a/external/dyninst b/external/dyninst
index 3d1942dee7..ccf4c24749 160000
--- a/external/dyninst
+++ b/external/dyninst
@@ -1 +1 @@
-Subproject commit 3d1942dee70a0008a7bb9e5f18d8b4abc0a91290
+Subproject commit ccf4c247497a24742e418883350df5beb74ecec9
diff --git a/external/timemory b/external/timemory
index 68ce420086..ba3c648677 160000
--- a/external/timemory
+++ b/external/timemory
@@ -1 +1 @@
-Subproject commit 68ce420086bfd73cbf0986c5ad10d811c8934f78
+Subproject commit ba3c648677b3c6f217abe147ef3198f36239e234