Changed libdir for external libraries built with autotools (#24)

ROCm · Nov 10, 2024 · 3d10efc · 3d10efc
1 parent cef228b
commit 3d10efc
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
diff --git a/external/timemory b/external/timemory
+5 −4		cmake/Modules/ConfigLibunwind.cmake
+1 −0		source/timemory/utility/filepath.cpp