eztrace: split dev output and fix .pc files

This commit is contained in:
Sergei Zimmerman
2025-04-19 11:22:36 +00:00
parent 66a1d99b3f
commit 0d3583dbf0
2 changed files with 30 additions and 0 deletions
@@ -0,0 +1,23 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b36a8a94..74c6de2e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -195,8 +195,16 @@ set(EZTRACE_LIB_DIR ${CMAKE_INSTALL_FULL_LIBDIR})
#set(__PPTRACE_BINARY_TYPE "PPTRACE_BINARY_TYPE_BFD")
#set(abs_top_builddir ${CMAKE_BINARY_DIR})
-set(INSTALL_INCLUDEDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}")
-set(INSTALL_LIBDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
+if(IS_ABSOLUTE ${CMAKE_INSTALL_INCLUDEDIR})
+ set(INSTALL_INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}")
+else()
+ set(INSTALL_INCLUDEDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}")
+endif()
+if(IS_ABSOLUTE ${CMAKE_INSTALL_LIBDIR})
+ set(INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}")
+else()
+ set(INSTALL_LIBDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
+endif()
set(INSTALL_PKGCONFIG_DIR "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
# Subdirectory
+7
View File
@@ -17,6 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
outputs = [
"out"
"dev"
"lib"
"man"
];
@@ -28,8 +29,10 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-ccW4YjEf++tkdIJLze2x8B/SWbBBXnYt8UV9OH8+KGU=";
};
# Possibly upstream these patches.
patches = [
./0001-otf2-backend-cross.patch # To fix cross.
./0002-absolute-cmake-install-paths.patch # To fix generated .pc file
];
postPatch = ''
@@ -69,6 +72,10 @@ stdenv.mkDerivation (finalAttrs: {
otf2 # `otf2-print` needed by compiler_instrumentation_tests,pthread_tests,posixio_tests
];
postInstall = ''
moveToOutput bin/eztrace_create_plugin "$dev"
'';
meta = {
description = "Tool that aims at generating automatically execution trace from HPC programs";
homepage = "https://eztrace.gitlab.io/eztrace/index.html";