# rhel6 and rhel7 need more recent tbb and boost libraries.  The dyninst external project setup

# will download, build, and install to the final location.  We change that to build from source.tar

# included in the src.rpm, install in the rpmbuild/BUILD tree and finally install into rpmbuild/BUILDTREE

# We also remove the dependency on cmake 3

--- dyninst-12.1.0/instructionAPI/CMakeLists.txt.orig	2022-03-09 17:41:45.000000000 -0500

+++ dyninst-12.1.0/instructionAPI/CMakeLists.txt	2022-05-06 16:24:00.973999675 -0400

@@ -33,3 +33,3 @@

 if (${CMAKE_CXX_COMPILER_ID} MATCHES "GNU")

-    if (${CMAKE_CXX_COMPILER_VERSION} MATCHES "^([1-9]|1[01])(\.|$)")

+    if (${CMAKE_CXX_COMPILER_VERSION} MATCHES "^([1-9]|1[01])(.|$)")

         # Disable var-tracking-assignments for InstructionDecoder-power.C for

@@ -41,3 +41,3 @@

         # succeeds, but the object file produced is >1GB, so disable it.

-        string(APPEND instructionDecoderPowerExtraFlags "-fno-var-tracking-assignments")

+        set(instructionDecoderPowerExtraFlags "${instructionDecoderPowerExtraFlags} -fno-var-tracking-assignments")

     endif()

@@ -47,8 +47,6 @@

 if (debugMaxFrameSizeOverridePowerOpcodeTable)

-        string(APPEND instructionDecoderPowerExtraFlags

-                " $<$<CONFIG:DEBUG>:-Wframe-larger-than=${debugMaxFrameSizeOverridePowerOpcodeTable}>")

+        set(instructionDecoderPowerExtraFlags "${instructionDecoderPowerExtraFlags} $<$<CONFIG:DEBUG>:-Wframe-larger-than=${debugMaxFrameSizeOverridePowerOpcodeTable}>")

 endif()

 if (nonDebugMaxFrameSizeOverridePowerOpcodeTable)

-        string(APPEND instructionDecoderPowerExtraFlags

-                " $<$<NOT:$<CONFIG:DEBUG>>:-Wframe-larger-than=${nonDebugMaxFrameSizeOverridePowerOpcodeTable}>")

+        set(instructionDecoderPowerExtraFlags "${instructionDecoderPowerExtraFlags} $<$<NOT:$<CONFIG:DEBUG>>:-Wframe-larger-than=${nonDebugMaxFrameSizeOverridePowerOpcodeTable}>")

 endif()

--- dyninst-12.1.0/CMakeLists.txt.orig	2022-03-09 17:41:45.000000000 -0500

+++ dyninst-12.1.0/CMakeLists.txt	2022-05-09 15:59:30.211632542 -0400

@@ -1,2 +1,2 @@

-cmake_minimum_required (VERSION 3.4.0)

+cmake_minimum_required (VERSION 2.8)

@@ -15,3 +15,3 @@

-set(STERILE_BUILD ON CACHE BOOL "Do not download/build any third-party dependencies from source")

+set(STERILE_BUILD OFF CACHE BOOL "Do not download/build any third-party dependencies from source")

@@ -245,1 +245,24 @@

 install(FILES ${PROJECT_BINARY_DIR}/CMakeCache.txt DESTINATION ${INSTALL_CMAKE_DIR})

+

+# RHEL 6/7 need more recent TBB and BOOST libraries, cmake will build them as an external project.

+# Copy resulting libraries from temp install dir to dyninst install dir

+# Note: FILE GLOB does not work as make has not yet run so we need to explicitly set the list

+

+set(TBB_AND_BOOST_LIBS tbb/install/lib/libtbbmalloc_proxy.so.2 tbb/install/lib/libtbbmalloc.so.2 tbb/install/lib/libtbb.so.2 boost/install/lib/libboost_atomic.so.1.66.0 boost/install/lib/libboost_atomic.so boost/install/lib/libboost_chrono.so.1.66.0 boost/install/lib/libboost_chrono.so boost/install/lib/libboost_date_time.so.1.66.0 boost/install/lib/libboost_date_time.so boost/install/lib/libboost_filesystem.so.1.66.0 boost/install/lib/libboost_filesystem.so boost/install/lib/libboost_system.so.1.66.0 boost/install/lib/libboost_system.so boost/install/lib/libboost_thread.so.1.66.0 boost/install/lib/libboost_thread.so boost/install/lib/libboost_timer.so.1.66.0 boost/install/lib/libboost_timer.so)

+

+get_filename_component(install_lib_dir_dir ${INSTALL_LIB_DIR} DIRECTORY)

+get_filename_component(dyninst_dir ${INSTALL_LIB_DIR} NAME)

+get_filename_component(lib_dir ${install_lib_dir_dir} NAME)

+get_filename_component(install_include_dir_dir ${INSTALL_INCLUDE_DIR} DIRECTORY)

+get_filename_component(include_dir ${install_include_dir_dir} NAME)

+foreach(F ${TBB_AND_BOOST_LIBS})

+  # DESTDIR is prefixed to the install dir

+  message("install ${Dyninst_BINARY_DIR}/${F} into ${CMAKE_INSTALL_PREFIX}/${lib_dir}/${dyninst_dir}")

+  install(PROGRAMS "${Dyninst_BINARY_DIR}/${F}" DESTINATION "${CMAKE_INSTALL_PREFIX}/${lib_dir}/${dyninst_dir}")

+endforeach()

+message("install tbb/install/include into ${CMAKE_INSTALL_PREFIX}/${include_dir}/tbb}")

+install(DIRECTORY DESTINATION "${CMAKE_INSTALL_PREFIX}/${include_dir}/tbb/")

+install(DIRECTORY "tbb/install/include/" DESTINATION "${CMAKE_INSTALL_PREFIX}/${include_dir}")

+message("install boost/install/include into ${CMAKE_INSTALL_PREFIX}/${include_dir}/boost}")

+install(DIRECTORY DESTINATION "${CMAKE_INSTALL_PREFIX}/${include_dir}/boost/")

+install(DIRECTORY "boost/install/include/" DESTINATION "${CMAKE_INSTALL_PREFIX}/${include_dir}/")

--- dyninst-12.1.0/cmake/Boost.cmake.orig	2022-03-09 17:41:45.000000000 -0500

+++ dyninst-12.1.0/cmake/Boost.cmake	2022-05-09 16:00:35.228389591 -0400

@@ -53,3 +53,3 @@ endif()

 # Need at least Boost-1.67 because of deprecated headers

-set(_boost_min_version 1.70.0)

+set(_boost_min_version 1.66.0)

@@ -134,3 +134,3 @@ set(Boost_NO_BOOST_CMAKE ON)

 #     This should _not_ be a cache variable

-set(_boost_components atomic chrono date_time filesystem thread timer)

+set(_boost_components atomic chrono date_time filesystem system thread timer)

@@ -182,3 +182,4 @@ else()

   # Change the base directory

-  set(Boost_ROOT_DIR ${CMAKE_INSTALL_PREFIX} CACHE PATH "Base directory the of Boost installation" FORCE)

+#  set(Boost_ROOT_DIR ${CMAKE_INSTALL_PREFIX} CACHE PATH "Base directory the of Boost installation" FORCE)

+  set(Boost_ROOT_DIR "${CMAKE_BINARY_DIR}/boost/install" CACHE PATH "TBB root directory" FORCE)

@@ -216,3 +217,3 @@ else()

 	# list(JOIN ...) is in cmake 3.12

-    string(CONCAT _boost_lib_names "${_boost_lib_names}${c},")

+    set(_boost_lib_names "${_boost_lib_names}${c},")

   endforeach()

@@ -224,3 +225,3 @@ else()

     PREFIX ${CMAKE_BINARY_DIR}/boost

-    URL http://downloads.sourceforge.net/project/boost/boost/${_boost_download_version}/boost_${_boost_download_filename}.zip

+    URL /tmp/boost_${_boost_download_filename}.tar.bz2

     BUILD_IN_SOURCE 1

--- dyninst-12.1.0/cmake/warnings.cmake.orig	2022-03-09 17:41:45.000000000 -0500

+++ dyninst-12.1.0/cmake/warnings.cmake	2022-05-09 12:02:21.000059066 -0400

@@ -78,3 +78,3 @@ if (CMAKE_C_COMPILER_ID MATCHES "^(GNU|C

     if (${v})

-        string(APPEND SUPPORTED_C_WARNING_FLAGS " -${f}")

+        set(SUPPORTED_C_WARNING_FLAGS "${SUPPORTED_C_WARNING_FLAGS} -${f}")

         if (f MATCHES "^(.*)=[0-9]+$")

@@ -95,3 +95,3 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "^(GNU

     if (${v})

-        string(APPEND SUPPORTED_CXX_WARNING_FLAGS " -${f}")

+        set(SUPPORTED_CXX_WARNING_FLAGS "${SUPPORTED_CXX_WARNING_FLAGS} -${f}")

         if (f MATCHES "^(.*)=[0-9]+$")

@@ -112,3 +112,3 @@ endif()

 #

-if (HAS_CPP_FLAG_Wframe_larger_than)

+if (false AND HAS_CPP_FLAG_Wframe_larger_than)

     # Override the default frame size maximum for DEBUG (-O0) build types

@@ -125,3 +125,3 @@ if (HAS_CPP_FLAG_Wframe_larger_than)

     set(debugMaxFrameSizeOverridePowerOpcodeTable 358400)

-    if (${CMAKE_CXX_COMPILER_VERSION} MATCHES "^[7](\.|$)")

+    if (${CMAKE_CXX_COMPILER_VERSION} MATCHES "^[7](.|$)")

 	set(nonDebugMaxFrameSizeOverridePowerOpcodeTable 38912)

@@ -134,4 +134,4 @@ if (MSVC)

   message(STATUS "TODO: Set up custom warning flags for MSVC")

-  string(APPEND CMAKE_C_FLAGS "/wd4251 /wd4091 /wd4503")

-  string(APPEND CMAKE_CXX_FLAGS "/wd4251 /wd4091 /wd4503")

+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4251 /wd4091 /wd4503")

+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4251 /wd4091 /wd4503")

 endif()

--- dyninst-12.1.0/cmake/Modules/FindBoost.cmake.orig	2022-03-09 17:41:45.000000000 -0500

+++ dyninst-12.1.0/cmake/Modules/FindBoost.cmake	2022-05-06 16:22:04.726563013 -0400

@@ -242,3 +242,3 @@

 cmake_policy(PUSH)

-cmake_policy(SET CMP0057 NEW) # if IN_LIST

+# cmake_policy(SET CMP0057 NEW) # if IN_LIST

@@ -338,3 +338,3 @@ macro(_Boost_ADJUST_LIB_VARS basename)

       if("x${basename}" STREQUAL "xTHREAD" AND NOT TARGET Threads::Threads)

-        string(APPEND Boost_ERROR_REASON_THREAD " (missing dependency: Threads)")

+        set(Boost_ERROR_REASON_THREAD "${Boost_ERROR_REASON_THREAD} (missing dependency: Threads)")

         set(Boost_THREAD_FOUND OFF)

@@ -1021,4 +1021,8 @@ function(_Boost_MISSING_DEPENDENCIES com

       foreach(componentdep ${_Boost_${uppercomponent}_DEPENDENCIES})

-        if (NOT ("${componentdep}" IN_LIST _boost_processed_components OR "${componentdep}" IN_LIST _boost_new_components))

-          list(APPEND _boost_new_components ${componentdep})

+        list (FIND _boost_processed_components ${componentdep} _index)

+	if (${_index} EQUAL -1)

+	  list (FIND _boost_new_components ${componentdep} _index)

+	  if (${_index} EQUAL -1)

+            list(APPEND _boost_new_components ${componentdep})

+	  endif()

         endif()

@@ -1199,9 +1203,9 @@ endif()

 # enable dynamic linking.

-if(NOT TARGET Boost::diagnostic_definitions)

-  add_library(Boost::diagnostic_definitions INTERFACE IMPORTED)

-  add_library(Boost::disable_autolinking INTERFACE IMPORTED)

-  add_library(Boost::dynamic_linking INTERFACE IMPORTED)

-  set_target_properties(Boost::dynamic_linking PROPERTIES

-    INTERFACE_COMPILE_DEFINITIONS "BOOST_ALL_DYN_LINK")

-endif()

+# if(NOT TARGET Boost::diagnostic_definitions)

+#   add_library(Boost::diagnostic_definitions INTERFACE IMPORTED)

+#   add_library(Boost::disable_autolinking INTERFACE IMPORTED)

+#   add_library(Boost::dynamic_linking INTERFACE IMPORTED)

+#   set_target_properties(Boost::dynamic_linking PROPERTIES

+#     INTERFACE_COMPILE_DEFINITIONS "BOOST_ALL_DYN_LINK")

+# endif()

 if(WIN32)

@@ -1387,4 +1391,5 @@ if(Boost_INCLUDE_DIR)

-  string(APPEND Boost_ERROR_REASON

-    "Boost version: ${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}\nBoost include path: ${Boost_INCLUDE_DIR}")

+  set(Boost_ERROR_REASON

+    "${Boost_ERROR_REASON}

+   Boost version: ${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}\nBoost include path: ${Boost_INCLUDE_DIR}")

   if(Boost_DEBUG)

@@ -1410,12 +1415,12 @@ if(Boost_INCLUDE_DIR)

       # State that we found a version of Boost that is too new or too old.

-      string(APPEND Boost_ERROR_REASON

-        "\nDetected version of Boost is too ${_Boost_VERSION_AGE}. Requested version was ${Boost_FIND_VERSION_MAJOR}.${Boost_FIND_VERSION_MINOR}")

+      set(Boost_ERROR_REASON

+        "${Boost_ERROR_REASON}

+       \nDetected version of Boost is too ${_Boost_VERSION_AGE}. Requested version was ${Boost_FIND_VERSION_MAJOR}.${Boost_FIND_VERSION_MINOR}")

       if (Boost_FIND_VERSION_PATCH)

-        string(APPEND Boost_ERROR_REASON

-          ".${Boost_FIND_VERSION_PATCH}")

+        set(Boost_ERROR_REASON "${Boost_ERROR_REASON}.${Boost_FIND_VERSION_PATCH}")

       endif ()

       if (NOT Boost_FIND_VERSION_EXACT)

-        string(APPEND Boost_ERROR_REASON " (or newer)")

+        set(Boost_ERROR_REASON "${Boost_ERROR_REASON} (or newer)")

       endif ()

-      string(APPEND Boost_ERROR_REASON ".")

+      set(Boost_ERROR_REASON "${Boost_ERROR_REASON}.")

     endif ()

@@ -1427,4 +1432,5 @@ else()

   set(Boost_FOUND 0)

-  string(APPEND Boost_ERROR_REASON

-    "Unable to find the Boost header files. Please set BOOST_ROOT to the root directory containing Boost or BOOST_INCLUDEDIR to the directory containing Boost's headers.")

+  set(Boost_ERROR_REASON

+    "${Boost_ERROR_REASON}

+   Unable to find the Boost header files. Please set BOOST_ROOT to the root directory containing Boost or BOOST_INCLUDEDIR to the directory containing Boost's headers.")

 endif()

@@ -1518,3 +1524,3 @@ if(WIN32 AND Boost_USE_DEBUG_RUNTIME)

           OR "x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xIntel")

-    string(APPEND _boost_DEBUG_ABI_TAG "g")

+    set(_boost_DEBUG_ABI_TAG "${_boost_DEBUG_ABI_TAG}g")

   endif()

@@ -1523,6 +1529,6 @@ endif()

 if(Boost_USE_DEBUG_PYTHON)

-  string(APPEND _boost_DEBUG_ABI_TAG "y")

+  set(_boost_DEBUG_ABI_TAG "${_boost_DEBUG_ABI_TAG}y")

 endif()

 #  d        using a debug version of your code

-string(APPEND _boost_DEBUG_ABI_TAG "d")

+set(_boost_DEBUG_ABI_TAG "${_boost_DEBUG_ABI_TAG}d")

 #  p        using the STLport standard library rather than the

@@ -1530,4 +1536,4 @@ string(APPEND _boost_DEBUG_ABI_TAG "d")

 if(Boost_USE_STLPORT)

-  string(APPEND _boost_RELEASE_ABI_TAG "p")

-  string(APPEND _boost_DEBUG_ABI_TAG "p")

+  set(_boost_RELEASE_ABI_TAG "${_boost_RELEASE_ABI_TAG}p")

+  set(_boost_DEBUG_ABI_TAG "${_boost_DEBUG_ABI_TAG}p")

 endif()

@@ -1537,4 +1543,4 @@ endif()

 if(Boost_USE_STLPORT_DEPRECATED_NATIVE_IOSTREAMS)

-  string(APPEND _boost_RELEASE_ABI_TAG "n")

-  string(APPEND _boost_DEBUG_ABI_TAG "n")

+  set(_boost_RELEASE_ABI_TAG "${_boost_RELEASE_ABI_TAG}n")

+  set(_boost_DEBUG_ABI_TAG "${_boost_DEBUG_ABI_TAG}n")

 endif()

@@ -1554,3 +1560,3 @@ else()

   if(NOT "x${CMAKE_CXX_COMPILER_ARCHITECTURE_ID}" STREQUAL "x" AND NOT Boost_VERSION VERSION_LESS 106600)

-    string(APPEND _boost_ARCHITECTURE_TAG "-")

+    set(_boost_ARCHITECTURE_TAG "${_boost_ARCHITECTURE_TAG}-")

     # This needs to be kept in-sync with the section of CMakePlatformId.h.in

@@ -1558,10 +1564,10 @@ else()

     if(CMAKE_CXX_COMPILER_ARCHITECTURE_ID STREQUAL "IA64")

-      string(APPEND _boost_ARCHITECTURE_TAG "i")

+      set(_boost_ARCHITECTURE_TAG "${_boost_ARCHITECTURE_TAG}i")

     elseif(CMAKE_CXX_COMPILER_ARCHITECTURE_ID STREQUAL "X86"

               OR CMAKE_CXX_COMPILER_ARCHITECTURE_ID STREQUAL "x64")

-      string(APPEND _boost_ARCHITECTURE_TAG "x")

+      set(_boost_ARCHITECTURE_TAG "${_boost_ARCHITECTURE_TAG}x")

     elseif(CMAKE_CXX_COMPILER_ARCHITECTURE_ID MATCHES "^ARM")

-      string(APPEND _boost_ARCHITECTURE_TAG "a")

+      set(_boost_ARCHITECTURE_TAG "${_boost_ARCHITECTURE_TAG}a")

     elseif(CMAKE_CXX_COMPILER_ARCHITECTURE_ID STREQUAL "MIPS")

-      string(APPEND _boost_ARCHITECTURE_TAG "m")

+      set(_boost_ARCHITECTURE_TAG "${_boost_ARCHITECTURE_TAG}m")

     endif()

@@ -1569,5 +1575,5 @@ else()

     if(CMAKE_SIZEOF_VOID_P EQUAL 8)

-      string(APPEND _boost_ARCHITECTURE_TAG "64")

+      set(_boost_ARCHITECTURE_TAG "${_boost_ARCHITECTURE_TAG}64")

     else()

-      string(APPEND _boost_ARCHITECTURE_TAG "32")

+      set(_boost_ARCHITECTURE_TAG "${_boost_ARCHITECTURE_TAG}32")

     endif()

@@ -1696,3 +1702,4 @@ _Boost_MISSING_DEPENDENCIES(Boost_FIND_C

 # If thread is required, get the thread libs as a dependency

-if("thread" IN_LIST Boost_FIND_COMPONENTS)

+list (FIND Boost_FIND_COMPONENTS "thread" _index)

+if (${_index} GREATER -1)

   if(Boost_FIND_QUIETLY)

@@ -1974,13 +1981,16 @@ if(Boost_FOUND)

     # error message that lists the libraries we were unable to find.

-    string(APPEND Boost_ERROR_REASON

-      "\nCould not find the following")

+    set(Boost_ERROR_REASON

+      "${Boost_ERROR_REASON}

+     \nCould not find the following")

     if(Boost_USE_STATIC_LIBS)

-      string(APPEND Boost_ERROR_REASON " static")

+      set(Boost_ERROR_REASON "${Boost_ERROR_REASON} static")

     endif()

-    string(APPEND Boost_ERROR_REASON

-      " Boost libraries:\n")

+    set(Boost_ERROR_REASON

+      "${Boost_ERROR_REASON}

+      Boost libraries:\n")

     foreach(COMPONENT ${_Boost_MISSING_COMPONENTS})

       string(TOUPPER ${COMPONENT} UPPERCOMPONENT)

-      string(APPEND Boost_ERROR_REASON

-        "        ${Boost_NAMESPACE}_${COMPONENT}${Boost_ERROR_REASON_${UPPERCOMPONENT}}\n")

+      set(Boost_ERROR_REASON

+        "${Boost_ERROR_REASON}

+               ${Boost_NAMESPACE}_${COMPONENT}${Boost_ERROR_REASON_${UPPERCOMPONENT}}\n")

     endforeach()

@@ -1990,7 +2000,9 @@ if(Boost_FOUND)

     if (${Boost_NUM_COMPONENTS_WANTED} EQUAL ${Boost_NUM_MISSING_COMPONENTS})

-      string(APPEND Boost_ERROR_REASON

-        "No Boost libraries were found. You may need to set BOOST_LIBRARYDIR to the directory containing Boost libraries or BOOST_ROOT to the location of Boost.")

+      set(Boost_ERROR_REASON

+        "${Boost_ERROR_REASON}

+       No Boost libraries were found. You may need to set BOOST_LIBRARYDIR to the directory containing Boost libraries or BOOST_ROOT to the location of Boost.")

     else ()

-      string(APPEND Boost_ERROR_REASON

-        "Some (but not all) of the required Boost libraries were found. You may need to install these additional Boost libraries. Alternatively, set BOOST_LIBRARYDIR to the directory containing Boost libraries or BOOST_ROOT to the location of Boost.")

+      set(Boost_ERROR_REASON

+        "${Boost_ERROR_REASON}

+       Some (but not all) of the required Boost libraries were found. You may need to install these additional Boost libraries. Alternatively, set BOOST_LIBRARYDIR to the directory containing Boost libraries or BOOST_ROOT to the location of Boost.")

     endif ()

@@ -2017,5 +2029,5 @@ if(Boost_FOUND)

     if(EXISTS "${_boost_LIB_DIR}/lib")

-      string(APPEND _boost_LIB_DIR /lib)

+      set(_boost_LIB_DIR "_boost_LIB_DIR/lib")

     elseif(EXISTS "${_boost_LIB_DIR}/stage/lib")

-      string(APPEND _boost_LIB_DIR "/stage/lib")

+      set(_boost_LIB_DIR "${_boost_LIB_DIR}/stage/lib")

     else()

--- dyninst-12.1.0/cmake/ThreadingBuildingBlocks.cmake.orig	2019-07-15 22:26:08.788921240 -0400

+++ dyninst-12.1.0/cmake/ThreadingBuildingBlocks.cmake	2019-07-16 20:37:56.804643938 -0400

@@ -107,7 +107,8 @@

   endif()

   # Forcibly update the cache variables

-  set(TBB_ROOT_DIR ${CMAKE_INSTALL_PREFIX} CACHE PATH "TBB root directory" FORCE)

+#  set(TBB_ROOT_DIR ${CMAKE_INSTALL_PREFIX} CACHE PATH "TBB root directory" FORCE)

+  set(TBB_ROOT_DIR "${CMAKE_BINARY_DIR}/tbb/install" CACHE PATH "TBB root directory" FORCE)

   set(TBB_INCLUDE_DIRS ${TBB_ROOT_DIR}/include CACHE PATH "TBB include directory" FORCE)

   set(TBB_LIBRARY_DIRS ${TBB_ROOT_DIR}/lib CACHE PATH "TBB library directory" FORCE)

   set(TBB_DEFINITIONS "" CACHE STRING "TBB compiler definitions" FORCE)

@@ -152,7 +153,7 @@

   ExternalProject_Add(

     TBB

     PREFIX ${_tbb_prefix_dir}

-    URL https://github.com/01org/tbb/archive/${_tbb_ver_major}_U${_tbb_ver_minor}.tar.gz

+    URL /tmp/2018_U6.tar.gz

     BUILD_IN_SOURCE 1

     CONFIGURE_COMMAND ""

     BUILD_COMMAND

--- dyninst-12.1.0/cmake/Modules/DyninstSystemPaths.cmake.orig	2019-07-15 22:26:08.783921240 -0400

+++ dyninst-12.1.0/cmake/Modules/DyninstSystemPaths.cmake	2019-07-18 13:53:48.726269387 -0400

@@ -1,2 +1,3 @@

 set(DYNINST_SYSTEM_INCLUDE_PATHS

+    ${INCLUDE_INSTALL_DIR}

     /usr/include

@@ -11,2 +12,3 @@

 set(DYNINST_SYSTEM_LIBRARY_PATHS

+    ${LIB_INSTALL_DIR}

     /usr/lib

@@ -22,1 +24,4 @@

     ENV PATH)

+foreach(F ${DYNINST_SYSTEM_LIBRARY_PATHS})

+  message("DYNINST_SYSTEM_LIBRARY_PATHS " ${F})

+endforeach()

--- dyninst-12.1.0/cmake/Modules/FindLibElf.cmake.orig	2019-05-16 14:40:05.000000000 -0400

+++ dyninst-12.1.0/cmake/Modules/FindLibElf.cmake	2019-07-17 16:45:41.082644142 -0400

@@ -45,5 +45,4 @@

 find_library(LibElf_LIBRARIES

-             NAMES libelf.so.1 libelf.so

-             HINTS ${LibElf_ROOT_DIR}/lib ${LibElf_ROOT_DIR} ${LibElf_LIBRARYDIR}

-             PATHS ${DYNINST_SYSTEM_LIBRARY_PATHS}

+             NAMES libelf.so.dts.1 libelf.so.1 libelf.so 

+             HINTS ${DYNINST_SYSTEM_LIBRARY_PATHS} ${LibElf_ROOT_DIR}/lib ${LibElf_ROOT_DIR} ${LibElf_LIBRARYDIR}

              PATH_SUFFIXES ${_path_suffixes})

--- dyninst-12.1.0/cmake/Modules/FindLibDwarf.cmake.orig	2019-05-16 14:40:05.000000000 -0400

+++ dyninst-12.1.0/cmake/Modules/FindLibDwarf.cmake	2019-07-17 21:53:14.098297367 -0400

@@ -42,6 +42,5 @@

 find_library(LibDwarf_LIBRARIES

-             NAMES libdw.so.1 libdw.so

-             HINTS ${LibDwarf_ROOT_DIR}/lib ${LibDwarf_ROOT_DIR} ${LibDwarf_LIBRARYDIR}

-             PATHS ${DYNINST_SYSTEM_LIBRARY_PATHS}

+             NAMES libdw.so.dts.1 libdw.so.1 libdw.so 

+             HINTS ${DYNINST_SYSTEM_LIBRARY_PATHS} ${LibDwarf_ROOT_DIR}/lib ${LibDwarf_ROOT_DIR} ${LibDwarf_LIBRARYDIR}

              PATH_SUFFIXES ${_path_suffixes})

--- dyninst-12.1.0/cmake/ThreadingBuildingBlocks.cmake.orig	2021-04-08 16:48:12.000000000 -0400

+++ dyninst-12.1.0/cmake/ThreadingBuildingBlocks.cmake	2021-05-07 12:40:13.092183538 -0400

@@ -52,3 +52,3 @@

 else()

-  set(_tbb_min_version 2018.6)

+  set(_tbb_min_version 2018.0)

 endif()

--- dyninst-12.1.0/common/CMakeLists.txt.orig	2022-03-09 17:41:45.000000000 -0500

+++ dyninst-12.1.0/common/CMakeLists.txt	2022-05-06 15:50:58.664146983 -0400

@@ -90,3 +90,3 @@ set (SRC_LIST ${SRC_LIST}

 if (${CMAKE_CXX_COMPILER_ID} MATCHES "GNU")

-    if (${CMAKE_CXX_COMPILER_VERSION} MATCHES "^[789](\.|$)")

+    if (${CMAKE_CXX_COMPILER_VERSION} MATCHES "^[789](.|$)")

 	# Disable var-tracking-assignments for arch-x86.C for gcc 7, 8, & 9.

--- dyninst-12.1.0/cmake/ElfUtils.cmake.orig	2022-03-09 17:41:45.000000000 -0500

+++ dyninst-12.1.0/cmake/ElfUtils.cmake	2022-05-06 16:54:28.918892511 -0400

@@ -40,3 +40,3 @@ endif()

 # NB: We need >=0.186 because of NVIDIA line map extensions

-set(_min_version 0.186)

+set(_min_version 0.185)