# 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-10.1.0/dyninst-10.1.0/CMakeLists.txt.orig	2019-07-16 22:08:06.406557467 -0400

+++ dyninst-10.1.0/dyninst-10.1.0/CMakeLists.txt	2019-07-16 22:07:50.790557717 -0400

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

-cmake_minimum_required (VERSION 3.4.0)

+cmake_minimum_required (VERSION 2.8)

 project (Dyninst)

@@ -227,1 +227,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_chrono.so.1.66.0 boost/install/lib/libboost_date_time.so.1.66.0 boost/install/lib/libboost_filesystem.so.1.66.0 boost/install/lib/libboost_system.so.1.66.0 boost/install/lib/libboost_thread.so.1.66.0 boost/install/lib/libboost_timer.so.1.66.0)

+

+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-10.1.0/dyninst-10.1.0/cmake/ElfUtils.cmake.orig	2019-07-04 15:29:42.310512456 -0400

+++ dyninst-10.1.0/dyninst-10.1.0/cmake/ElfUtils.cmake	2019-05-16 14:40:05.000000000 -0400

@@ -35,3 +35,3 @@

 # Minimum acceptable version of elfutils

-set(_min_version 0.173)

+set(_min_version 0.170)

 set(ElfUtils_MIN_VERSION ${_min_version}

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

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

@@ -105,7 +105,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)

@@ -142,7 +143,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-10.1.0/dyninst-10.1.0/cmake/Boost.cmake.orig	2019-07-15 22:26:08.789921240 -0400

+++ dyninst-10.1.0/dyninst-10.1.0/cmake/Boost.cmake	2019-07-16 09:32:52.921281788 -0400

@@ -49,3 +49,3 @@

 # Need at least Boost-1.61 for filesytem components

-set(_boost_min_version 1.61.0)

+set(_boost_min_version 1.66.0)

@@ -176,3 +176,4 @@

   # 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)

@@ -210,3 +211,3 @@

 	# 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()

@@ -218,3 +219,3 @@

     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-10.1.0/dyninst-10.1.0/cmake/Modules/FindBoost.cmake.orig	2019-07-04 13:11:35.161644923 -0400

+++ dyninst-10.1.0/dyninst-10.1.0/cmake/Modules/FindBoost.cmake	2019-07-04 13:13:25.646643157 -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 @@

       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 @@

       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 @@

 # 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 @@

-  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,4 +1415,5 @@

       # 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)

@@ -1417,5 +1423,5 @@

       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 +1433,5 @@

   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 +1525,3 @@

           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 +1530,6 @@

 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 +1537,4 @@

 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 +1544,4 @@

 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 +1561,3 @@

   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 +1565,10 @@

     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 +1576,5 @@

     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 +1703,4 @@

 # 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,4 +1982,5 @@

     # 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)

@@ -1979,8 +1988,10 @@

     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 +2001,9 @@

     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 +2030,5 @@

     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-10.1.0/dyninst-10.1.0/cmake/Modules/DyninstSystemPaths.cmake.orig	2019-07-15 22:26:08.783921240 -0400

+++ dyninst-10.1.0/dyninst-10.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-10.1.0/dyninst-10.1.0/cmake/Modules/FindLibElf.cmake.orig	2019-05-16 14:40:05.000000000 -0400

+++ dyninst-10.1.0/dyninst-10.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-10.1.0/dyninst-10.1.0/cmake/Modules/FindLibDwarf.cmake.orig	2019-05-16 14:40:05.000000000 -0400

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

@@ -42,5 +42,4 @@

 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-10.1.0/testsuite-10.1.0/CMakeLists.txt.orig	2019-07-17 14:29:17.614616431 -0400

+++ dyninst-10.1.0/testsuite-10.1.0/CMakeLists.txt	2019-07-17 14:29:34.865616156 -0400

@@ -1,4 +1,4 @@

-cmake_minimum_required(VERSION 3.4.0)

+cmake_minimum_required(VERSION 2.8)

 project(Dyninst-TestSuite)

 # User must provide location of Dyninst cmake files either as a cache or