[gentoo-commits] repo/gentoo:master commit in: dev-libs/rocm-comgr/files/

[Craig Andrews]

commit:     fc7f769a1d485d97e35eed22615bad218fc392d0
Author:     Craig Andrews <candrews <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  2 12:55:52 2020 +0000
Commit:     Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Thu Jan  2 12:55:52 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc7f769a

dev-libs/rocm-comgr: Remove unused patches

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>

 .../files/rocm-comgr-2.6.0-correctly-install.patch |  44 ------
 .../files/rocm-comgr-2.6.0-dependencies.patch      |  38 -----
 .../files/rocm-comgr-2.6.0-unbundle-yaml-cpp.patch |  30 ----
 .../rocm-comgr-2.7.0-llvm-interface-change.patch   | 176 ---------------------
 4 files changed, 288 deletions(-)

diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-correctly-install.patch b/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-correctly-install.patch
deleted file mode 100644
index 74206760f39..00000000000
--- a/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-correctly-install.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 98f589636729b1e25625db6880fbd7820dcf9e40 Mon Sep 17 00:00:00 2001
-From: Craig Andrews <candrews@××××××××××××.com>
-Date: Wed, 31 Jul 2019 10:04:11 -0400
-Subject: [PATCH] Install to standard locations using GNUInstallDirs
-
-Some distributions require 64 bit libraries to be installed to lib64, for example.
-Using GNUInstallDirs ensures that files are installed to the expected locations.
----
- CMakeLists.txt | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 454b830..a89af16 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,5 +1,7 @@
- cmake_minimum_required(VERSION 3.2.0)
- 
-+include (GNUInstallDirs)
-+
- # Build ROCM-Compiler-Support with ccache if the package is present.
- set(ROCM_COMPILER_SUPPORT_CCACHE_BUILD OFF CACHE BOOL "Set to ON for a ccache enabled build")
- if(ROCM_COMPILER_SUPPORT_CCACHE_BUILD)
-@@ -146,17 +148,17 @@ configure_file("cmake/${AMD_COMGR_CONFIG_NAME}.in"
- 
- install(TARGETS amd_comgr
-   EXPORT amd_comgr_export
--  DESTINATION lib)
-+  DESTINATION ${CMAKE_INSTALL_LIBDIR})
- 
- install(FILES
-   "include/amd_comgr.h"
--  DESTINATION include)
-+  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
- 
- install(FILES
-   "README.md"
-   "LICENSE.txt"
-   "NOTICES.txt"
--  DESTINATION share/amd_comgr)
-+  DESTINATION ${CMAKE_INSTALL_DATADIR}/amd_comgr)
- 
- # Generate the install-tree package.
- set(AMD_COMGR_PREFIX_CODE "

diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-dependencies.patch b/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-dependencies.patch
deleted file mode 100644
index bce19d168b0..00000000000
--- a/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-dependencies.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/pull/19
-
---- comgr/CMakeLists.old	2019-07-19 17:19:26.080276421 +0200
-+++ comgr/CMakeLists.txt	2019-07-19 18:17:25.780163592 +0200
-@@ -185,7 +185,11 @@
- include_directories(./yaml-cpp/include)
- 
- set(CLANG_LIBS
--  clangFrontendTool)
-+  clangFrontendTool
-+  clangFrontend
-+  clangBasic
-+  clangDriver
-+  clangSerialization)
- 
- set(LLD_LIBS
-   lldELF
-@@ -193,8 +197,19 @@
- 
- llvm_map_components_to_libnames(LLVM_LIBS
-   ${LLVM_TARGETS_TO_BUILD}
-+  Option
-   DebugInfoDWARF
--  Symbolize)
-+  Symbolize
-+  Support
-+  Object
-+  BitWriter
-+  MC
-+  MCParser
-+  MCDisassembler
-+  Core
-+  IRReader
-+  CodeGen
-+  Linker)
- 
- target_link_libraries(amd_comgr
-   PUBLIC

diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-unbundle-yaml-cpp.patch b/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-unbundle-yaml-cpp.patch
deleted file mode 100644
index d61f4c2a200..00000000000
--- a/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-unbundle-yaml-cpp.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/lib/comgr/CMakeLists.txt b/lib/comgr/CMakeLists.txt
-index 454b830..70e2526 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -90,12 +90,8 @@ if (UNIX)
-         -Wl,--no-undefined)
-     endif()
-   endif()
--  # FIXME: Remove when yaml-cpp is removed from the build.
--  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
- else()
-   list(APPEND AMD_COMGR_PRIVATE_COMPILE_OPTIONS "/W0" "/wd4244")
--  # FIXME: Make this private once yaml-cpp is removed from the build.
--  add_definitions(-D_HAS_EXCEPTIONS=0)
- endif()
- 
- # Windows is strict about visibility of exports in shared libraries, so we ask
-@@ -179,10 +175,8 @@ install(EXPORT amd_comgr_export
-   DESTINATION "${AMD_COMGR_PACKAGE_PREFIX}"
-   FILE "${AMD_COMGR_TARGETS_NAME}")
- 
--set(YAML_CPP_BUILD_TESTS OFF CACHE BOOL "Enable testing" FORCE)
--set(YAML_CPP_BUILD_TOOLS OFF CACHE BOOL "Enable parse tools" FORCE)
--add_subdirectory(yaml-cpp EXCLUDE_FROM_ALL)
--include_directories(./yaml-cpp/include)
-+find_package(yaml-cpp REQUIRED)
-+include_directories(${YAML_CPP_INCLUDE_DIR})
- 
- set(CLANG_LIBS
-   clangFrontendTool)

diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-2.7.0-llvm-interface-change.patch b/dev-libs/rocm-comgr/files/rocm-comgr-2.7.0-llvm-interface-change.patch
deleted file mode 100644
index dc8ed42fc46..00000000000
--- a/dev-libs/rocm-comgr/files/rocm-comgr-2.7.0-llvm-interface-change.patch
+++ /dev/null
@@ -1,176 +0,0 @@
-From a73e4ce7c686787840454e206a17973685b03e62 Mon Sep 17 00:00:00 2001
-From: Michael LIAO <michaelhongbin.liao@×××.com>
-Date: Thu, 15 Aug 2019 13:25:58 -0400
-Subject: [PATCH] Fix comgr build due to LLVM interface change.
-
-Change-Id: I66c2203f09b683dd06807860eeb5f517cd200f0e
----
- src/comgr-objdump.cpp | 68 +++++++++++++++++++++++----------
- 1 file changed, 47 insertions(+), 21 deletions(-)
-
-diff --git a/src/comgr-objdump.cpp b/src/comgr-objdump.cpp
-index bf490b6..59a9d05 100644
---- a/src/comgr-objdump.cpp
-+++ b/src/comgr-objdump.cpp
-@@ -307,15 +307,18 @@ class SectionFilter {
-   FilterPredicate Predicate;
-   llvm::object::ObjectFile const &Object;
- };
-+
- SectionFilter ToolSectionFilter(llvm::object::ObjectFile const &O) {
-   return SectionFilter(
-       [](llvm::object::SectionRef const &S) {
-         if (FilterSections.empty())
-           return true;
--        llvm::StringRef String;
--        std::error_code error = S.getName(String);
--        if (error)
-+        Expected<StringRef> SecNameOrErr = S.getName();
-+        if (!SecNameOrErr) {
-+          consumeError(SecNameOrErr.takeError());
-           return false;
-+        }
-+        StringRef String = *SecNameOrErr;
-         return is_contained(FilterSections, String);
-       },
-       O);
-@@ -394,6 +397,18 @@ report_error(StringRef ArchiveName, const object::Archive::Child &C,
-     report_error(ArchiveName, NameOrErr.get(), std::move(E), ArchitectureName);
- }
- 
-+static LLVM_ATTRIBUTE_NORETURN void report_error(llvm::Error E,
-+                                                 StringRef File) {
-+  report_error(File, std::move(E));
-+}
-+
-+template <typename T, typename... Ts>
-+T unwrapOrError(Expected<T> EO, Ts &&... Args) {
-+  if (EO)
-+    return std::move(*EO);
-+  report_error(EO.takeError(), std::forward<Ts>(Args)...);
-+}
-+
- static const Target *getTarget(const ObjectFile *Obj = nullptr) {
-   // Figure out the target triple.
-   llvm::Triple TheTriple("unknown-unknown-unknown");
-@@ -822,13 +837,13 @@ static void printRelocationTargetName(const MachOObjectFile *O,
-     for (const SectionRef &Section : ToolSectionFilter(*O)) {
-       std::error_code ec;
- 
--      StringRef Name;
-       uint64_t Addr = Section.getAddress();
-       if (Addr != Val)
-         continue;
--      if ((ec = Section.getName(Name)))
--        report_error(O->getFileName(), ec);
--      fmt << Name;
-+      Expected<StringRef> NameOrErr = Section.getName();
-+      if (!NameOrErr)
-+        report_error(O->getFileName(), NameOrErr.takeError());
-+      fmt << *NameOrErr;
-       return;
-     }
- 
-@@ -854,7 +869,11 @@ static void printRelocationTargetName(const MachOObjectFile *O,
-     section_iterator SI = O->section_begin();
-     // Adjust for the fact that sections are 1-indexed.
-     advance(SI, Val - 1);
--    SI->getName(S);
-+    Expected<StringRef> SOrErr = SI->getName();
-+    if (!SOrErr)
-+      consumeError(SOrErr.takeError());
-+    else
-+      S = *SOrErr;
-   }
- 
-   fmt << S;
-@@ -1362,8 +1381,7 @@ void llvm::DisassemHelper::DisassembleObject(const ObjectFile *Obj,
-       DataRefImpl DR = Section.getRawDataRefImpl();
-       SegmentName = MachO->getSectionFinalSegmentName(DR);
-     }
--    StringRef name;
--    error(Section.getName(name));
-+    StringRef name = unwrapOrError(Section.getName(), Obj->getFileName());
- 
-     if ((SectionAddr <= StopAddress) &&
-         (SectionAddr + SectSize) >= StartAddress) {
-@@ -1675,8 +1693,7 @@ void llvm::DisassemHelper::PrintRelocations(const ObjectFile *Obj) {
-   for (const SectionRef &Section : ToolSectionFilter(*Obj)) {
-     if (Section.relocation_begin() == Section.relocation_end())
-       continue;
--    StringRef secname;
--    error(Section.getName(secname));
-+    StringRef secname = unwrapOrError(Section.getName(), Obj->getFileName());
-     OutS << "RELOCATION RECORDS FOR [" << secname << "]:\n";
-     for (const RelocationRef &Reloc : Section.relocations()) {
-       bool hidden = getHidden(Reloc);
-@@ -1699,8 +1716,7 @@ void llvm::DisassemHelper::PrintSectionHeaders(const ObjectFile *Obj) {
-           "Idx Name          Size      Address          Type\n";
-   unsigned i = 0;
-   for (const SectionRef &Section : ToolSectionFilter(*Obj)) {
--    StringRef Name;
--    error(Section.getName(Name));
-+    StringRef Name = unwrapOrError(Section.getName(), Obj->getFileName());
-     uint64_t Address = Section.getAddress();
-     uint64_t Size = Section.getSize();
-     bool Text = Section.isText();
-@@ -1717,9 +1733,8 @@ void llvm::DisassemHelper::PrintSectionHeaders(const ObjectFile *Obj) {
- void llvm::DisassemHelper::PrintSectionContents(const ObjectFile *Obj) {
-   std::error_code EC;
-   for (const SectionRef &Section : ToolSectionFilter(*Obj)) {
--    StringRef Name;
-     StringRef Contents;
--    error(Section.getName(Name));
-+    StringRef Name = unwrapOrError(Section.getName(), Obj->getFileName());
-     uint64_t BaseAddr = Section.getAddress();
-     uint64_t Size = Section.getSize();
-     if (!Size)
-@@ -1797,7 +1812,11 @@ void llvm::DisassemHelper::PrintSymbolTable(const ObjectFile *o,
-     section_iterator Section = *SectionOrErr;
-     StringRef Name;
-     if (Type == SymbolRef::ST_Debug && Section != o->section_end()) {
--      Section->getName(Name);
-+      Expected<StringRef> NameOrErr = Section->getName();
-+      if (!NameOrErr)
-+        consumeError(NameOrErr.takeError());
-+      else
-+        Name = *NameOrErr;
-     } else {
-       Expected<StringRef> NameOrErr = Symbol.getName();
-       if (!NameOrErr)
-@@ -1846,8 +1865,7 @@ void llvm::DisassemHelper::PrintSymbolTable(const ObjectFile *o,
-         StringRef SegmentName = MachO->getSectionFinalSegmentName(DR);
-         OutS << SegmentName << ",";
-       }
--      StringRef SectionName;
--      error(Section->getName(SectionName));
-+      StringRef SectionName = unwrapOrError(Section->getName(), o->getFileName());
-       OutS << SectionName;
-     }
- 
-@@ -1978,7 +1996,11 @@ void llvm::DisassemHelper::printRawClangAST(const ObjectFile *Obj) {
-   Optional<object::SectionRef> ClangASTSection;
-   for (auto Sec : ToolSectionFilter(*Obj)) {
-     StringRef Name;
--    Sec.getName(Name);
-+    auto NameOrErr = Sec.getName();
-+    if (!NameOrErr) // FIXME: Need better error handling.
-+      consumeError(NameOrErr.takeError());
-+    else
-+      Name = *NameOrErr;
-     if (Name == ClangASTSectionName) {
-       ClangASTSection = Sec;
-       break;
-@@ -2015,7 +2037,11 @@ void llvm::DisassemHelper::printFaultMaps(const ObjectFile *Obj) {
- 
-   for (auto Sec : ToolSectionFilter(*Obj)) {
-     StringRef Name;
--    Sec.getName(Name);
-+    auto NameOrErr = Sec.getName();
-+    if (!NameOrErr) // FIXME: Need better error handling.
-+      consumeError(NameOrErr.takeError());
-+    else
-+      Name = *NameOrErr;
-     if (Name == FaultMapSectionName) {
-       FaultMapSection = Sec;
-       break;