From 0334aea65b80920d82a6da9b09c0e9fa6f6099f0 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Wed, 11 Nov 2020 08:09:11 +0000
Subject: [PATCH] import dyninst-10.2.1-2.el8

---
 SOURCES/dyninst-10.2.1-dbid.patch | 13 ++-----------
 SPECS/dyninst.spec                |  7 ++++++-
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/SOURCES/dyninst-10.2.1-dbid.patch b/SOURCES/dyninst-10.2.1-dbid.patch
index 91b5407..78f3997 100644
--- a/SOURCES/dyninst-10.2.1-dbid.patch
+++ b/SOURCES/dyninst-10.2.1-dbid.patch
@@ -92,18 +92,9 @@ https://sourceware.org/elfutils/Debuginfod.html
  elseif(NOT (LibElf_FOUND AND LibDwarf_FOUND) AND STERILE_BUILD)
    message(FATAL_ERROR "Elfutils not found and cannot be downloaded because build is sterile.")
  else()
-@@ -104,7 +121,7 @@ else()
-   if(NOT (${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU") OR NOT (${CMAKE_C_COMPILER_ID} STREQUAL "GNU"))
-     message(FATAL_ERROR "ElfUtils will only build with the GNU compiler")
-   endif()
--  
-+
-   include(ExternalProject)
-   externalproject_add(
-     ElfUtils
 
---- /dedyninst-10.2.1/dyninst-10.2.1/null
-+++ b/cmake/Modules/FindLibDebuginfod.cmake
+--- /dev/null
++++ dyninst-10.2.1/dyninst-10.2.1/cmake/Modules/FindLibDebuginfod.cmake
 @@ -0,0 +1,76 @@
 +#========================================================================================
 +# FindDebuginfod
diff --git a/SPECS/dyninst.spec b/SPECS/dyninst.spec
index d43ff8a..f1f9c1f 100644
--- a/SPECS/dyninst.spec
+++ b/SPECS/dyninst.spec
@@ -2,7 +2,7 @@ Summary: An API for Run-time Code Generation
 License: LGPLv2+
 Name: dyninst
 Group: Development/Libraries
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.dyninst.org
 Version: 10.2.1
 ExclusiveArch: %{ix86} x86_64 ppc64le aarch64
@@ -24,6 +24,7 @@ Patch6: %{name}-10.2.1-tbb.patch
 BuildRequires: gcc-c++
 BuildRequires: elfutils-devel
 BuildRequires: elfutils-libelf-devel
+BuildRequires: elfutils-debuginfod-client-devel
 BuildRequires: boost-devel
 BuildRequires: binutils-devel
 BuildRequires: cmake
@@ -117,6 +118,7 @@ export CFLAGS CXXFLAGS LDFLAGS
 
 %cmake \
  -DENABLE_STATIC_LIBS=1 \
+ -DENABLE_DEBUGINFOD=1 \
  -DINSTALL_LIB_DIR:PATH=%{_libdir}/dyninst \
  -DINSTALL_INCLUDE_DIR:PATH=%{_includedir}/dyninst \
  -DINSTALL_CMAKE_DIR:PATH=%{_libdir}/cmake/Dyninst \
@@ -203,6 +205,9 @@ find %{buildroot}%{_libdir}/dyninst/testsuite/ \
 %attr(644,root,root) %{_libdir}/dyninst/testsuite/*.a
 
 %changelog
+* Fri Nov 06 2020 Stan Cox <scox@redhat.com> - 10.2.1-2
+- Enable debuginfod
+
 * Wed Oct 28 2020 Stan Cox <scox@redhat.com> - 10.2.1-1
 - Update to 10.2.1