From: Marcin Krol Date: Wed, 28 Aug 2019 19:11:32 +0000 (+0200) Subject: - updated to 10.1.0 X-Git-Tag: auto/th/dyninst-10.1.0-2~3 X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=676d1ad60297a79e2cce91c47f8eb21121599913;p=packages%2Fdyninst.git - updated to 10.1.0 --- diff --git a/boost-1.69.patch b/boost-1.69.patch deleted file mode 100644 index f0ae45d..0000000 --- a/boost-1.69.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 54a2debd94c3e8df3b6f1e579f1db02dae61cbb7 Mon Sep 17 00:00:00 2001 -From: "Mark W. Krentel" -Date: Fri, 1 Feb 2019 13:14:11 -0600 -Subject: [PATCH] Add some explicit casts from boost::tribool to bool for some - code in (#541) - -Add some explicit casts from boost::tribool to bool for some code in dataflowAPI/rose/util/Message.[Ch]. This was breaking the build when using boost >= 1.69. ---- - dataflowAPI/rose/util/Message.C | 2 +- - dataflowAPI/rose/util/Message.h | 3 ++- - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/dataflowAPI/rose/util/Message.C b/dataflowAPI/rose/util/Message.C -index a8a66ad4c..5e276f97d 100644 ---- a/dataflowAPI/rose/util/Message.C -+++ b/dataflowAPI/rose/util/Message.C -@@ -1123,7 +1123,7 @@ StreamBuf::bake() { - destination_->bakeDestinations(message_.properties(), baked_/*out*/); - anyUnbuffered_ = false; - for (BakedDestinations::const_iterator bi=baked_.begin(); bi!=baked_.end() && !anyUnbuffered_; ++bi) -- anyUnbuffered_ = !bi->second.isBuffered; -+ anyUnbuffered_ = static_cast(!bi->second.isBuffered); - isBaked_ = true; - } - } -diff --git a/dataflowAPI/rose/util/Message.h b/dataflowAPI/rose/util/Message.h -index 816f68d2e..03592cb97 100644 ---- a/dataflowAPI/rose/util/Message.h -+++ b/dataflowAPI/rose/util/Message.h -@@ -386,7 +386,8 @@ struct SAWYER_EXPORT ColorSpec { - ColorSpec(AnsiColor fg, AnsiColor bg, bool bold): foreground(fg), background(bg), bold(bold) {} - - /** Returns true if this object is in its default-constructed state. */ -- bool isDefault() const { return COLOR_DEFAULT==foreground && COLOR_DEFAULT==background && !bold; } -+ bool isDefault() const { return COLOR_DEFAULT==foreground && COLOR_DEFAULT==background -+ && static_cast(!bold); } - }; - - /** Colors to use for each message importance. diff --git a/dyninst-libname.patch b/dyninst-libname.patch index c406aef..4d619e3 100644 --- a/dyninst-libname.patch +++ b/dyninst-libname.patch @@ -1,10 +1,11 @@ ---- dyninst-9.3.1/common/CMakeLists.txt.orig 2017-04-09 19:23:42.065823975 +0200 -+++ dyninst-9.3.1/common/CMakeLists.txt 2017-04-09 19:28:45.709153841 +0200 -@@ -112,6 +112,7 @@ +diff -ur dyninst-10.1.0.orig/common/CMakeLists.txt dyninst-10.1.0/common/CMakeLists.txt +--- dyninst-10.1.0.orig/common/CMakeLists.txt 2019-05-16 20:40:05.000000000 +0200 ++++ dyninst-10.1.0/common/CMakeLists.txt 2019-08-28 20:22:16.367000000 +0200 +@@ -111,6 +111,7 @@ dyninst_library(common ${DEPS}) +set_target_properties(common PROPERTIES OUTPUT_NAME dyncommon) - if(PLATFORM MATCHES nt OR PLATFORM MATCHES windows) - target_link_private_libraries(common Psapi WS2_32 dbghelp) + if(TARGET TBB) + add_dependencies(common TBB) endif() diff --git a/dyninst-types.patch b/dyninst-types.patch deleted file mode 100644 index 5774b93..0000000 --- a/dyninst-types.patch +++ /dev/null @@ -1,54 +0,0 @@ ---- dyninst-9.3.1/symtabAPI/src/Object-elf.C.orig 2017-03-02 22:38:32.000000000 +0100 -+++ dyninst-9.3.1/symtabAPI/src/Object-elf.C 2017-04-09 20:52:53.689096202 +0200 -@@ -3630,9 +3630,9 @@ - std::vector &addresses, - const mach_relative_info &mi) - { -- Offset try_start = (Offset) -1; -- Offset try_end = (Offset) -1; -- Offset catch_start = 0; -+ unsigned long try_start = (unsigned long) -1; -+ unsigned long try_end = (unsigned long) -1; -+ unsigned long catch_start = 0; - - Elf_X_Data data = except_table->get_data(); - const unsigned char *datap = (const unsigned char *)data.get_string(); -@@ -3652,7 +3652,7 @@ - i += read_val_of_type(DW_EH_PE_udata8, &catch_start, datap + i, mi); - } - -- if (try_start != (Offset) -1 && try_end != (Offset) -1) { -+ if (try_start != (unsigned long) -1 && try_end != (unsigned long) -1) { - ExceptionBlock eb(try_start, (unsigned) (try_end - try_start), catch_start); - addresses.push_back(eb); - } ---- dyninst-9.3.1/symtabAPI/src/emitElf.C.orig 2017-03-02 22:38:32.000000000 +0100 -+++ dyninst-9.3.1/symtabAPI/src/emitElf.C 2017-04-09 21:05:01.219087893 +0200 -@@ -651,7 +651,7 @@ - } - } - -- vector > moveSecAddrRange = obj->getObject()->getMoveSecAddrRange(); -+ vector > moveSecAddrRange = obj->getObject()->getMoveSecAddrRange(); - - for (unsigned i = 0; i != moveSecAddrRange.size(); i++) { - if ((moveSecAddrRange[i][0] == shdr->sh_addr) || ---- dyninst-9.3.1/symtabAPI/src/dwarfWalker.C.orig 2017-04-09 21:31:37.515736334 +0200 -+++ dyninst-9.3.1/symtabAPI/src/dwarfWalker.C 2017-04-09 21:31:42.419069611 +0200 -@@ -1820,13 +1820,13 @@ - Dwarf_Attribute strattr; - - if (attr == DW_AT_call_file || attr == DW_AT_decl_file) { -- unsigned long line_index; -+ Address line_index; - bool result = findConstant(attr, line_index, entry(), dbg()); - if (!result) - return false; - if (line_index >= mod()->getStrings()->size()) { -- dwarf_printf("Dwarf error reading line index %d from srcFiles of size %lu\n", -- line_index, mod()->getStrings()->size()); -+ dwarf_printf("Dwarf error reading line index %lu from srcFiles of size %lu\n", -+ (unsigned long)line_index, mod()->getStrings()->size()); - return false; - } - // cout << "findString found " << (*srcFiles())[line_index].str << " at srcFiles[" << line_index << "] for " << mod()->fileName() << endl; diff --git a/dyninst.spec b/dyninst.spec index 2cb45b2..d0101c8 100644 --- a/dyninst.spec +++ b/dyninst.spec @@ -1,18 +1,16 @@ Summary: API for Run-time Code Generation Summary(pl.UTF-8): API do generowania kodu w czasie działania Name: dyninst -Version: 9.3.2 -Release: 2 +Version: 10.1.0 +Release: 1 License: LGPL v2.1+ Group: Libraries # http://www.dyninst.org/downloads/dyninst-9.x #Source0Download: https://github.com/dyninst/dyninst/releases Source0: https://github.com/dyninst/dyninst/archive/v%{version}/%{name}-%{version}.tar.gz -# Source0-md5: a2bf03b6d1d424853e80d39b13e9c229 +# Source0-md5: 3711fca820ceb8e76d5b026964c5029d Patch0: %{name}-libname.patch Patch1: %{name}-x32.patch -Patch2: %{name}-types.patch -Patch3: boost-1.69.patch URL: http://www.dyninst.org/dyninst # libiberty BuildRequires: binutils-devel @@ -89,8 +87,6 @@ Dokumentacja do bibliotek dyninst. %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 -%patch3 -p1 %build %cmake . \ @@ -116,33 +112,39 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) %doc COPYRIGHT CHANGELOG.md README.md +%attr(755,root,root) %{_bindir}/cfg_to_dot +%attr(755,root,root) %{_bindir}/codeCoverage +%attr(755,root,root) %{_bindir}/ddb.db +%attr(755,root,root) %{_bindir}/params.db %attr(755,root,root) %{_bindir}/parseThat +%attr(755,root,root) %{_bindir}/unistd.db +%attr(755,root,root) %{_bindir}/unstrip %attr(755,root,root) %{_libdir}/libdynC_API.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libdynC_API.so.9.3 +%attr(755,root,root) %ghost %{_libdir}/libdynC_API.so.10.1 %attr(755,root,root) %{_libdir}/libdynDwarf.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libdynDwarf.so.9.3 +%attr(755,root,root) %ghost %{_libdir}/libdynDwarf.so.10.1 %attr(755,root,root) %{_libdir}/libdynElf.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libdynElf.so.9.3 +%attr(755,root,root) %ghost %{_libdir}/libdynElf.so.10.1 %attr(755,root,root) %{_libdir}/libdyncommon.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libdyncommon.so.9.3 +%attr(755,root,root) %ghost %{_libdir}/libdyncommon.so.10.1 %attr(755,root,root) %{_libdir}/libdyninstAPI.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libdyninstAPI.so.9.3 +%attr(755,root,root) %ghost %{_libdir}/libdyninstAPI.so.10.1 %attr(755,root,root) %{_libdir}/libdyninstAPI_RT.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libdyninstAPI_RT.so.9.3 +%attr(755,root,root) %ghost %{_libdir}/libdyninstAPI_RT.so.10.1 %attr(755,root,root) %{_libdir}/libinstructionAPI.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libinstructionAPI.so.9.3 +%attr(755,root,root) %ghost %{_libdir}/libinstructionAPI.so.10.1 %attr(755,root,root) %{_libdir}/libparseAPI.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libparseAPI.so.9.3 +%attr(755,root,root) %ghost %{_libdir}/libparseAPI.so.10.1 %attr(755,root,root) %{_libdir}/libpatchAPI.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libpatchAPI.so.9.3 +%attr(755,root,root) %ghost %{_libdir}/libpatchAPI.so.10.1 %attr(755,root,root) %{_libdir}/libpcontrol.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libpcontrol.so.9.3 +%attr(755,root,root) %ghost %{_libdir}/libpcontrol.so.10.1 %attr(755,root,root) %{_libdir}/libstackwalk.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libstackwalk.so.9.3 +%attr(755,root,root) %ghost %{_libdir}/libstackwalk.so.10.1 %attr(755,root,root) %{_libdir}/libsymLite.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libsymLite.so.9.3 +%attr(755,root,root) %ghost %{_libdir}/libsymLite.so.10.1 %attr(755,root,root) %{_libdir}/libsymtabAPI.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libsymtabAPI.so.9.3 +%attr(755,root,root) %ghost %{_libdir}/libsymtabAPI.so.10.1 %files devel %defattr(644,root,root,755) @@ -152,6 +154,7 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_libdir}/libdyncommon.so %attr(755,root,root) %{_libdir}/libdyninstAPI.so %attr(755,root,root) %{_libdir}/libdyninstAPI_RT.so +%attr(755,root,root) %{_libdir}/libInst.so %attr(755,root,root) %{_libdir}/libinstructionAPI.so %attr(755,root,root) %{_libdir}/libparseAPI.so %attr(755,root,root) %{_libdir}/libpatchAPI.so