public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/dyninst] rawhide: Respin against newer tbb & compatibility patch.
@ 2026-06-13 22:36 Frank Ch. Eigler
  0 siblings, 0 replies; only message in thread
From: Frank Ch. Eigler @ 2026-06-13 22:36 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/dyninst
Branch : rawhide
Commit : c617c1c54bbc527eab13818d2cb90610a1812611
Author : Frank Ch. Eigler <fche@redhat.com>
Date   : 2026-06-13T18:35:52-04:00
Stats  : +51/-1 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/dyninst/c/c617c1c54bbc527eab13818d2cb90610a1812611?branch=rawhide

Log:
Respin against newer tbb & compatibility patch.

---
diff --git a/dyninst.spec b/dyninst.spec
index c690445..f264d26 100644
--- a/dyninst.spec
+++ b/dyninst.spec
@@ -2,7 +2,7 @@ Summary: An API for Run-time Code Generation
 License: LGPL-2.1-or-later AND GPL-3.0-or-later WITH Bison-exception-2.2 AND LicenseRef-Fedora-Public-Domain AND BSD-3-Clause
 Name: dyninst
 Group: Development/Libraries
-Release: 9%{?dist}
+Release: 10%{?dist}
 URL: https://www.paradyn.org
 Version: 13.0.0
 ExclusiveArch: x86_64 ppc64le aarch64
@@ -12,6 +12,7 @@ Patch1: github-pr1721.patch
 Patch2: github-pr1880.patch
 Patch3: github-pr1880-ish.patch
 Patch4: github-pr1730.patch
+Patch5: github-pr2196.patch
 
 %global dyninst_base dyninst-%{version}
 
@@ -71,6 +72,7 @@ pushd %{dyninst_base}
 %patch -P2 -p1
 %patch -P3 -p1
 %patch -P4 -p1
+%patch -P5 -p1
 popd
 
 # cotire seems to cause non-deterministic gcc errors
@@ -148,6 +150,9 @@ echo "%{_libdir}/dyninst" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf
 %{_libdir}/cmake/Dyninst
 
 %changelog
+* Sat Jun 13 2026 Frank Ch. EIgler <fche@redhat.com> - 13.0.0-10
+- Rebuilt with PR/2196 patch for tbb 2023.0.0 compatibility
+
 * Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 13.0.0-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
 

diff --git a/github-pr2196.patch b/github-pr2196.patch
new file mode 100644
index 0000000..b8a1563
--- /dev/null
+++ b/github-pr2196.patch
@@ -0,0 +1,45 @@
+commit e03567db37547f9a848f68f5a0e2c58d2aa17fe9
+gpg: Signature made Mon 06 Apr 2026 03:07:23 PM EDT
+gpg:                using RSA key B5690EEEBB952194
+gpg: Can't check signature: No public key
+Author: Tim Haines <thaines.astro@gmail.com>
+Date:   Mon Apr 6 19:07:23 2026 +0000
+
+    Add explicit include of TBB version header (#2196)
+    
+    The latest version (2022.3.0, released 29-OCT-2025) doesn't have the implicit include anymore.
+
+diff --git a/cmake/tpls/DyninstTBB.cmake b/cmake/tpls/DyninstTBB.cmake
+index 6433967167fb..8bb69531c1a7 100644
+--- a/cmake/tpls/DyninstTBB.cmake
++++ b/cmake/tpls/DyninstTBB.cmake
+@@ -49,4 +49,13 @@ message(STATUS "Found TBB ${TBB_VERSION}")
+ get_target_property(_tmp TBB::tbb INTERFACE_INCLUDE_DIRECTORIES)
+ message(STATUS "TBB include directories: ${_tmp}")
+ 
++# Starting with 2021.2, the version macros were extracted into 'version.h'
++# To retain support for earlier versions, we conditionally include it
++foreach(_dir ${_tmp})
++  if(EXISTS "${_dir}/tbb/version.h")
++    target_compile_definitions(Dyninst::TBB INTERFACE "DYNINST_TBB_HAS_VERSION_H")
++    break()
++  endif()
++endforeach()
++
+ unset(_find_path_args)
+diff --git a/common/h/concurrent.h b/common/h/concurrent.h
+index fd7891d07ea4..a305ab05566d 100644
+--- a/common/h/concurrent.h
++++ b/common/h/concurrent.h
+@@ -42,6 +42,11 @@
+ #include <tbb/concurrent_hash_map.h>
+ #include <tbb/concurrent_vector.h>
+ #include <tbb/concurrent_queue.h>
++
++#ifdef DYNINST_TBB_HAS_VERSION_H
++#include <tbb/version.h>
++#endif
++
+ #include <boost/functional/hash.hpp>
+ 
+ namespace Dyninst {

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-06-13 22:36 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-06-13 22:36 [rpms/dyninst] rawhide: Respin against newer tbb & compatibility patch Frank Ch. Eigler

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox