diff --git a/.devtoolset-9-dyninst.metadata b/.devtoolset-9-dyninst.metadata new file mode 100644 index 0000000..104a9f6 --- /dev/null +++ b/.devtoolset-9-dyninst.metadata @@ -0,0 +1,4 @@ +9e870040323cec2c367b1598351a66a6574eb7c2 SOURCES/2018_U6.tar.gz +b6b284acde2ad7ed49b44e856955d7b1ea4e9459 SOURCES/boost_1_66_0.tar.bz2 +02029d0224460f866f92ef54221efa37ee1ba164 SOURCES/dyninst-10.1.0.tar.gz +cbafd2da77de24180cb9c2fb5b600fd8d2cb2fa1 SOURCES/testsuite-10.1.0.tar.gz diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..aa83d4e --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +SOURCES/2018_U6.tar.gz +SOURCES/boost_1_66_0.tar.bz2 +SOURCES/dyninst-10.1.0.tar.gz +SOURCES/testsuite-10.1.0.tar.gz diff --git a/SOURCES/dyninst-10.1.0-cmake.patch b/SOURCES/dyninst-10.1.0-cmake.patch new file mode 100644 index 0000000..46d33d9 --- /dev/null +++ b/SOURCES/dyninst-10.1.0-cmake.patch @@ -0,0 +1,314 @@ +# 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 diff --git a/SOURCES/dyninst-10.1.0-elfstatic.patch b/SOURCES/dyninst-10.1.0-elfstatic.patch new file mode 100644 index 0000000..14a4755 --- /dev/null +++ b/SOURCES/dyninst-10.1.0-elfstatic.patch @@ -0,0 +1,15 @@ +--- dyninst-10.1.0/dyninst-10.1.0/symtabAPI/src/emitElfStatic-x86.C.orig 2019-07-15 22:26:08.996921237 -0400 ++++ dyninst-10.1.0/dyninst-10.1.0/symtabAPI/src/emitElfStatic-x86.C 2019-07-15 22:26:08.995921237 -0400 +@@ -275,10 +275,12 @@ + break; + case R_X86_64_PLT32: + case R_X86_64_PC32: ++ /* + case R_X86_64_REX_GOTPCRELX: + fieldSize = sizeof(Elf64_Word); + relocation = symbolOffset + addend - relOffset; + break; ++ */ + case R_X86_64_GOT32: // The address is computed when the GOT is built + fieldSize = sizeof(Elf64_Word); + result = lmap.gotSymbols.find(rel.getDynSym()); diff --git a/SOURCES/dyninst-10.1.0-result.patch b/SOURCES/dyninst-10.1.0-result.patch new file mode 100644 index 0000000..2738cf2 --- /dev/null +++ b/SOURCES/dyninst-10.1.0-result.patch @@ -0,0 +1,28 @@ +--- dyninst-10.1.0/dyninst-10.1.0/instructionAPI/h/Result.h.sv 2018-11-09 11:48:08.000000000 -0500 ++++ dyninst-10.1.0/dyninst-10.1.0/instructionAPI/h/Result.h 2018-12-04 22:12:47.369579566 -0500 +@@ -449,10 +449,10 @@ + snprintf(hex, 20, "%x", val.s32val); + break; + case u64: +- snprintf(hex, 20, "%lx", val.u64val); ++ snprintf(hex, 20, "%" PRIx64, val.u64val); + break; + case s64: +- snprintf(hex, 20, "%lx", val.s64val); ++ snprintf(hex, 20, "%" PRIx64, val.s64val); + break; + case sp_float: + snprintf(hex, 20, "%f", val.floatval); +@@ -464,10 +464,10 @@ + snprintf(hex, 20, "%x", val.bitval); + break; + case u48: +- snprintf(hex, 20, "%lx", val.s48val); ++ snprintf(hex, 20, "%" PRIx64, val.s48val); + break; + case s48: +- snprintf(hex, 20, "%lx", val.s48val); ++ snprintf(hex, 20, "%" PRIx64, val.s48val); + break; + case m512: + snprintf(hex, 20, "%p", val.m512val); diff --git a/SOURCES/testsuite-10.1.0-386.patch b/SOURCES/testsuite-10.1.0-386.patch new file mode 100644 index 0000000..38dcd3a --- /dev/null +++ b/SOURCES/testsuite-10.1.0-386.patch @@ -0,0 +1,29 @@ +--- dyninst-10.1.0/testsuite-10.1.0/src/instruction/test_instruction_farcall.C ++++ dyninst-10.1.0/testsuite-10.1.0/src/instruction/test_instruction_farcall.C +@@ -96,21 +96,21 @@ test_results_t test_instruction_farcall_Mutator::executeTest() + if(decodedInsns.size() != expectedInsns) // six valid, one invalid + { + logerror("FAILED: Expected %d instructions, decoded %d\n", expectedInsns, decodedInsns.size()); +- for(std::vector::iterator curInsn = decodedInsns.begin(); ++ for(std::vector::iterator curInsn = decodedInsns.begin(); + curInsn != decodedInsns.end(); + ++curInsn) + { +- logerror("\t%s\t", (*curInsn)->format().c_str()); +- for(unsigned j = 0; j < (*curInsn)->size(); ++j) ++ logerror("\t%s\t", (*curInsn).format().c_str()); ++ for(unsigned j = 0; j < (*curInsn).size(); ++j) + { +- logerror("%x ", (*curInsn)->rawByte(j)); ++ logerror("%x ", (*curInsn).rawByte(j)); + } + logerror("\n"); + } + + return FAILED; + } +- if(decodedInsns.back() && decodedInsns.back()->isValid()) ++ if(decodedInsns.size() > 0 && decodedInsns.back().isValid()) + { + logerror("FAILED: Expected instructions to end with an invalid instruction, but they didn't"); + return FAILED; diff --git a/SPECS/dyninst.spec b/SPECS/dyninst.spec new file mode 100644 index 0000000..6823b54 --- /dev/null +++ b/SPECS/dyninst.spec @@ -0,0 +1,457 @@ +%{?scl:%scl_package dyninst} + +Summary: An API for Run-time Code Generation +License: LGPLv2+ +Name: %{?scl_prefix}dyninst +Group: Development/Libraries +Release: 4%{?dist} +URL: http://www.dyninst.org +Version: 10.1.0 +Exclusiveos: linux +ExclusiveArch: %{ix86} x86_64 + +Source0: https://github.com/dyninst/dyninst/archive/v%{version}/dyninst-%{version}.tar.gz +Source1: https://github.com/dyninst/testsuite/archive/v%{version}/testsuite-%{version}.tar.gz +Source2: https://sourceforge.net/projects/boost/files/boost/1.66.0/boost_1_66_0.tar.bz2 +Source3: https://github.com/01org/tbb/archive/2018_U6.tar.gz + +Patch1: dyninst-10.1.0-result.patch +Patch2: testsuite-10.1.0-386.patch +Patch3: dyninst-10.1.0-cmake.patch +Patch4: dyninst-10.1.0-elfstatic.patch + +%global dyninst_base dyninst-%{version} +%global testsuite_base testsuite-%{version} + + +BuildRequires: zlib-devel +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: boost-devel +BuildRequires: binutils-devel +BuildRequires: cmake +BuildRequires: libtirpc-devel +BuildRequires: tbb tbb-devel + +%{?scl:Requires: %scl_runtime} + +# Extra requires just for the testsuite +# NB, there's no separate libstdc++-static for <=el6 +%if 0%{?rhel} >= 7 +BuildRequires: libstdc++-static +%endif +BuildRequires: gcc-gfortran glibc-static nasm libxml2-devel + +%if 0%{?rhel} == 6 +# C++11 requires devtoolset gcc. +BuildRequires: %{?scl_prefix}gcc-c++ +BuildRequires: %{?scl_prefix}elfutils +BuildRequires: %{?scl_prefix}elfutils-devel +BuildRequires: %{?scl_prefix}elfutils-libelf-devel +Requires: %{?scl_prefix}elfutils +%else +%if 0%{?rhel} == 7 +BuildRequires: %{?scl_prefix}gcc-c++ +BuildRequires: %{?scl_prefix}elfutils +BuildRequires: %{?scl_prefix}elfutils-devel +BuildRequires: %{?scl_prefix}elfutils-libelf-devel +Requires: %{?scl_prefix}elfutils +%endif +%else +BuildRequires: elfutils-devel +BuildRequires: elfutils-libelf-devel +%endif + +# Testsuite files should not provide/require anything +%{?filter_setup: +%filter_provides_in %{_libdir}/dyninst/testsuite/ +%filter_requires_in %{_libdir}/dyninst/testsuite/ +%filter_setup +} + +%description + +Dyninst is an Application Program Interface (API) to permit the insertion of +code into a running program. The API also permits changing or removing +subroutine calls from the application program. Run-time code changes are +useful to support a variety of applications including debugging, performance +monitoring, and to support composing applications out of existing packages. +The goal of this API is to provide a machine independent interface to permit +the creation of tools and applications that use run-time code patching. + +%package doc +Summary: Documentation for using the Dyninst API +Group: Documentation +%description doc +dyninst-doc contains API documentation for the Dyninst libraries. + +%package devel +Summary: Header files for compiling programs with Dyninst +Group: Development/System +Requires: %{?scl_prefix}dyninst = %{version}-%{release} +Requires: boost-devel +Requires: tbb-devel +%description devel +dyninst-devel includes the C header files that specify the Dyninst user-space +libraries and interfaces. This is required for rebuilding any program +that uses Dyninst. + +%package static +Summary: Static libraries for the compiling programs with Dyninst +Group: Development/System +Requires: %{?scl_prefix}dyninst-devel = %{version}-%{release} +%description static +dyninst-static includes the static versions of the library files for +the dyninst user-space libraries and interfaces. + +%package testsuite +Summary: Programs for testing Dyninst +Group: Development/System +Requires: %{?scl_prefix}dyninst = %{version}-%{release} +Requires: %{?scl_prefix}dyninst-devel = %{version}-%{release} +Requires: %{?scl_prefix}dyninst-static = %{version}-%{release} +Requires: glibc-static +%description testsuite +dyninst-testsuite includes the test harness and target programs for +making sure that dyninst works properly. + +%prep +%setup -q -n %{name}-%{version} -c +%setup -q -T -D -a 1 +# setup source3 boost by copying where cmake can find it to build its own copy +cp %{_topdir}/SOURCES/boost_1_66_0.tar.bz2 /tmp +# setup source4 tbb by copying where cmake can find it to build its own copy +cp %{_topdir}/SOURCES/2018_U6.tar.gz /tmp + +%patch1 -p1 -b.result +%patch2 -p1 -b.386 +%patch3 -p1 -b.cmake +%patch4 -p1 -b.elfstatic + +# cotire seems to cause non-deterministic gcc errors +# https://bugzilla.redhat.com/show_bug.cgi?id=1420551 +sed -i.cotire -e 's/USE_COTIRE true/USE_COTIRE false/' \ + %{dyninst_base}/cmake/shared.cmake + +%build + +cd %{dyninst_base} + +%if 0%{?rhel} == 6 +# C++11 requires devtoolset gcc. +%{?scl:PATH=%{_bindir}${PATH:+:${PATH}}} +%endif + +%if 0%{?scl:1} +CPPFLAGS="-I%{_includedir}" +export CPPFLAGS +LDFLAGS="-L%{_libdir} -L%{_libdir}/elfutils" +export LDFLAGS +%endif + +%cmake \ + -DENABLE_STATIC_LIBS=1 \ + -DCMAKE_BUILD_TYPE:STRING=None \ + -DINSTALL_LIB_DIR:PATH=%{_libdir}/dyninst \ + -DINSTALL_INCLUDE_DIR:PATH=%{_includedir}/dyninst \ + -DINSTALL_CMAKE_DIR:PATH=%{_libdir}/cmake/Dyninst \ + -DLIBDWARF_LIBRARIES:FILEPATH="$libdwarf_builddir/libdwarf.a;-lz" \ + -DLIBDWARF_INCLUDE_DIR:PATH=$libdwarf_builddir \ + -DBoost_NO_BOOST_CMAKE=ON \ + -DCMAKE_SKIP_RPATH:BOOL=YES +# Dependencies building tbb, boost before dyninst are not correct +# make %{?_smp_mflags} +LD_RUN_PATH="%{_libdir}" +export LD_RUN_PATH +make -j1 + +# Hack to install dyninst nearby, so the testsuite can use it +make DESTDIR=../install install +find ../install -name '*.cmake' -execdir \ + sed -i -e 's!%{_prefix}!../install&!' '{}' '+' + +cd ../%{testsuite_base} +%cmake \ + -DDyninst_DIR:PATH=$PWD/../install%{_libdir}/cmake/Dyninst \ + -DINSTALL_DIR:PATH=%{_libdir}/dyninst/testsuite \ + -DCMAKE_BUILD_TYPE:STRING=Debug \ + -DBoost_NO_BOOST_CMAKE=ON \ + -DCMAKE_SKIP_RPATH:BOOL=YES +make %{?_smp_mflags} + +%install + +cd %{dyninst_base} +make DESTDIR=$RPM_BUILD_ROOT install + +# It doesn't install docs the way we want, so remove them. +# We'll just grab the pdfs later, directly from the build dir. +rm -v %{buildroot}%{_docdir}/*-%{version}.pdf + +cd ../%{testsuite_base} +make DESTDIR=$RPM_BUILD_ROOT install + +# Ugly hack to mask testsuite files from debuginfo extraction. Running the +# testsuite requires debuginfo, and separate debuginfo has issues. Debuginfo +# extraction is still nice for the main libraries, so we don't want to disable +# it package-wide. The permissions are restored by attr(755,-,-) in files. +find %{buildroot}%{_libdir}/dyninst/testsuite/ \ + -type f '!' -name '*.a' -execdir chmod 644 '{}' '+' + +%files +%defattr(-,root,root,-) + +%dir %{_libdir}/dyninst +%{_libdir}/dyninst/*.so.* +# dyninst mutators dlopen the runtime library +%{_libdir}/dyninst/libdyninstAPI_RT.so + +%doc %{dyninst_base}/COPYRIGHT +%doc %{dyninst_base}/LICENSE.md + +# %config(noreplace) /etc/ld.so.conf.d/* + +%files doc +%defattr(-,root,root,-) +%doc %{dyninst_base}/dataflowAPI/doc/dataflowAPI.pdf +%doc %{dyninst_base}/dynC_API/doc/dynC_API.pdf +%doc %{dyninst_base}/dyninstAPI/doc/dyninstAPI.pdf +%doc %{dyninst_base}/instructionAPI/doc/instructionAPI.pdf +%doc %{dyninst_base}/parseAPI/doc/parseAPI.pdf +%doc %{dyninst_base}/patchAPI/doc/patchAPI.pdf +%doc %{dyninst_base}/proccontrol/doc/proccontrol.pdf +%doc %{dyninst_base}/stackwalk/doc/stackwalk.pdf +%doc %{dyninst_base}/symtabAPI/doc/symtabAPI.pdf + +%files devel +%defattr(-,root,root,-) +%{_includedir}/dyninst +%{_includedir}/tbb +%{_libdir}/dyninst/*.so +%{_libdir}/cmake/Dyninst + +%files static +%defattr(-,root,root,-) +%{_libdir}/dyninst/*.a + +%files testsuite +%defattr(-,root,root,-) +%{_bindir}/parseThat +# Remove example tools packaged with dyninst +%exclude %{_bindir}/cfg_to_dot +%exclude %{_bindir}/codeCoverage +%exclude %{_bindir}/unstrip +%exclude %{_bindir}/ddb.db +%exclude %{_bindir}/params.db +%exclude %{_bindir}/unistd.db +# and the corresponding debuginfo +%exclude /usr/lib/debug/%{_bindir}/codeCoverage*debug +%exclude /usr/lib/debug/%{_bindir}/unstrip*debug + +%dir %{_libdir}/dyninst/testsuite/ +%attr(755,root,root) %{_libdir}/dyninst/testsuite/*[!a] +%attr(644,root,root) %{_libdir}/dyninst/testsuite/*.a + +%changelog +* Wed Oct 23 2019 Stan Cox - 10.1.0-4 +- Remove ppc, ppc64, ppc64le, aarch64 for rhel-7 +- rhbz1763156 devtoolset-9-dyninst-10.1.0-3.el7.aarch64 broken +- rhbz1763157 devtoolset-9-dyninst-10.1.0-3.el7.ppc64 (big endian) broken + +* Mon Oct 07 2019 Stan Cox - 10.1.0-3 +- Install tbb/include + +* Mon Sep 02 2019 Stan Cox - 10.1.0-2 +- Do not add libtbb*so libboost*so links to dyninst-devel. + +* Thu Jul 25 2019 Stan Cox - 10.1.0-1 +- Update to 10.1.0 + +* Tue Jan 8 2019 Stan Cox - 9.3.2-6 +- rhbz1498558 Needs dyninst-devtoolset installed +- rhbz1470149 Use separate debuginfo for dyninst-testsuite +- rhbz1647471 so name clashes + +* Tue Jul 17 2018 William Cohen - 9.3.2-5 +- Avoid conditional patching of source files. + +* Thu Jul 05 2018 Stan Cox - 9.3.2-4 +- Make specfile rhel agnostic + +* Thu Jan 04 2018 Stan Cox - 9.3.2-3 +- rhbz1503116 possible soname clashes between base rhel- and devtoolset- dyninst +- rhbz1538757 segfault with a glibc built with binutils-2.27: handle R_*_IRELATIVE + +* Thu Jan 04 2018 Stan Cox - 9.3.2-2 +- rhbz1503116 possible soname clashes between base rhel- and devtoolset- dyninst + +* Fri Jun 16 2017 Stan Cox - 9.3.2-1 +- Remove ppc/ppc64 for rhel-6 + +* Fri Jun 09 2017 Stan Cox - 9.3.2-1 +- Rebase to 9.3.2 + +* Thu Sep 15 2016 Josh Stone - 9.2.0-4 +- rhbz1366656: fix ppc64 relocation rewriting +- rhbz1366726: check mmap constrains for locality +- rhbz1367225: fix x86 codegen for 64-bit offsets + +* Tue Aug 09 2016 Josh Stone - 9.2.0-3 +- rhbz1363794: fix proccontrol attach without an exe. + +* Tue Jul 26 2016 Josh Stone - 9.2.0-2 +- Patch a template '>>' in stackanalysis.h for pre-C++11 users. + +* Thu Jul 21 2016 Josh Stone - 9.2.0-1 +- Update to 9.2.0 + +* Fri Mar 11 2016 Frank Ch. Eigler - 9.1.0-3 +- Export libdyninstAPI_RT_init_maxthreads (ref rhbz1315841/1316956) + +* Thu Feb 25 2016 Frank Ch. Eigler - 9.1.0-2 +- buildroot bump respin + +* Wed Jan 13 2016 Josh Stone - 9.1.0-1 +- Update to 9.1.0 + +* Mon Sep 21 2015 Josh Stone - 8.2.1-5 +- Rebuild for x86_64 only. + +* Mon Sep 21 2015 Josh Stone - 8.2.1-4 +- rhbz1261061: Make sure the system's Boost.cmake is not used. + +* Wed Jan 07 2015 Josh Stone - 8.2.1-3 +- Rebuild for x86_64 only. + +* Wed Jan 07 2015 Josh Stone - 8.2.1-2 +- Rebuild for releng updates. + +* Wed Dec 17 2014 Josh Stone - 8.2.1-1 +- Update to point release 8.2.1. + +* Tue Aug 19 2014 Josh Stone - 8.2.0-1 +- final rebase to 8.2.0, using upstream tag "v8.2.0.1" + +* Thu Jul 24 2014 Josh Stone - 8.2.0-0.440.gde280f74f40e +- update to a newer pre-8.2.0 snapshot + +* Wed May 21 2014 Josh Stone - 8.2.0-0.374.g593fb2773a48 +- more libdyninstAPI_RT symbols, and add testsuite requires + +* Wed May 21 2014 Josh Stone - 8.2.0-0.373.geaba204a72a3 +- fix libdyninstAPI_RT.so symbol visibility + +* Tue May 20 2014 Josh Stone - 8.2.0-0.372.gdfd4a8842f4c +- prerelease build of dyninst 8.2.0 + +* Tue Nov 26 2013 Josh Stone 8.0-6dw +- rhbz987096: backported upstream patches for mid-syscall PTRACE_EVENTs + +* Wed Apr 17 2013 Josh Stone 8.0-5dw +- rhbz855981: backported upstream patch to remove missing-dwarf asserts + +* Tue Feb 26 2013 Frank Ch. Eigler 8.0-4dw +- fix %attr() of testsuite files + +* Tue Feb 26 2013 Josh Stone 8.0-3dw +- rhbz915820: Add a dyninst-testsuite package. + +* Thu Jan 31 2013 Frank Ch. Eigler - 8.0-2dw +- convert to scl +- bundle libdwarf temporarily + +* Tue Nov 20 2012 Josh Stone +- Tweak the configure/make commands +- Disable the testsuite via configure. +- Set the private includedir and libdir via configure. +- Set VERBOSE_COMPILATION for make. +- Use DESTDIR for make install. + +* Mon Nov 19 2012 Josh Stone 8.0-1 +- Update to release 8.0. +- Updated "%files doc" to reflect renames. +- Drop the unused BuildRequires libxml2-devel. +- Drop the 7.99.x version-munging patch. + +* Fri Nov 09 2012 Josh Stone 7.99.2-0.29 +- Rebase to git e99d7070bbc39c76d6d528db530046c22681c17e + +* Mon Oct 29 2012 Josh Stone 7.99.2-0.28 +- Bump to 7.99.2 per abi-compliance-checker results + +* Fri Oct 26 2012 Josh Stone 7.99.1-0.27 +- Rebase to git dd8f40b7b4742ad97098613876efeef46d3d9e65 +- Use _smp_mflags to enable building in parallel. + +* Wed Oct 03 2012 Josh Stone 7.99.1-0.26 +- Rebase to git 557599ad7417610f179720ad88366c32a0557127 + +* Thu Sep 20 2012 Josh Stone 7.99.1-0.25 +- Rebase on newer git tree. +- Bump the fake version to 7.99.1 to account for ABI differences. +- Enforce the minimum libdwarf version. +- Drop the upstreamed R_PPC_NUM patch. + +* Wed Aug 15 2012 Karsten Hopp 7.99-0.24 +- check if R_PPC_NUM is defined before using it, similar to R_PPC64_NUM + +* Mon Jul 30 2012 Josh Stone 7.99-0.23 +- Rebase on newer git tree. +- Update license files with upstream additions. +- Split documentation into -doc subpackage. +- Claim ownership of %{_libdir}/dyninst. + +* Fri Jul 27 2012 William Cohen - 7.99-0.22 +- Correct requires for dyninst-devel. + +* Wed Jul 25 2012 Josh Stone - 7.99-0.21 +- Rebase on newer git tree +- Update context in dyninst-git.patch +- Drop dyninst-delete_array.patch +- Drop dyninst-common-makefile.patch + +* Wed Jul 18 2012 Fedora Release Engineering - 7.99-0.20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Mon Jul 16 2012 William Cohen - 7.99-0.19 +- Patch common/i386-unknown-linux2.4/Makefile to build. + +* Fri Jul 13 2012 William Cohen - 7.99-0.18 +- Rebase on newer git tree the has a number of merges into it. +- Adjust spec file to allow direct use of git patches +- Fix to eliminate unused varables. +- Proper delete for array. + +* Thu Jun 28 2012 William Cohen - 7.99-0.17 +- Rebase on newer git repo. + +* Thu Jun 28 2012 William Cohen - 7.99-0.16 +- Eliminate dynptr.h file use with rebase on newer git repo. + +* Mon Jun 25 2012 William Cohen - 7.99-0.14 +- Rebase on newer git repo. + +* Tue Jun 19 2012 William Cohen - 7.99-0.12 +- Fix static library and header file permissions. +- Use sources from the dyninst git repositories. +- Fix 32-bit library versioning for libdyninstAPI_RT_m32.so. + +* Wed Jun 13 2012 William Cohen - 7.99-0.11 +- Fix library versioning. +- Move .so links to dyninst-devel. +- Remove unneded clean section. + +* Fri May 11 2012 William Cohen - 7.0.1-0.9 +- Clean up Makefile rules. + +* Sat May 5 2012 William Cohen - 7.0.1-0.8 +- Clean up spec file. + +* Wed May 2 2012 William Cohen - 7.0.1-0.7 +- Use "make install" and do staged build. +- Use rpm configure macro. + +* Thu Mar 15 2012 William Cohen - 7.0.1-0.5 +- Nuke the bundled boost files and use the boost-devel rpm instead. + +* Mon Mar 12 2012 William Cohen - 7.0.1-0.4 +- Initial submission of dyninst spec file.