From 7ccc4f84d23eea0ec65022912afbedb5f6594e63 Mon Sep 17 00:00:00 2001
From: zhangxianting <zhangxianting@uniontech.com>
Date: Thu, 20 Jun 2024 10:40:36 +0800
Subject: [PATCH] the file of define tbb version macro has changed at version
 2021

---
 ...-version-detection-with-TBB-2021.1.1.patch | 26 +++++++++++++++++++
 dyninst.spec                                  |  7 ++++-
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 Fix-FindTBB-version-detection-with-TBB-2021.1.1.patch

diff --git a/Fix-FindTBB-version-detection-with-TBB-2021.1.1.patch b/Fix-FindTBB-version-detection-with-TBB-2021.1.1.patch
new file mode 100644
index 0000000..a3837e5
--- /dev/null
+++ b/Fix-FindTBB-version-detection-with-TBB-2021.1.1.patch
@@ -0,0 +1,26 @@
+From 817b1e41a05309d776f595f3f3eb96f1d2e39f6c Mon Sep 17 00:00:00 2001
+From: zhangxianting <zhangxianting@uniontech.com>
+Date: Fri, 21 Jun 2024 09:54:01 +0800
+Subject: [PATCH] Fix FindTBB version detection with TBB >= 2021.1.1
+
+---
+ cmake/Modules/FindTBB.cmake | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/dyninst-12.3.0/cmake/Modules/FindTBB.cmake b/dyninst-12.3.0/cmake/Modules/FindTBB.cmake
+index cc62ffe..694e2df 100644
+--- a/cmake/Modules/FindTBB.cmake
++++ b/cmake/Modules/FindTBB.cmake
+@@ -154,7 +154,8 @@ find_path(
+ if(TBB_INCLUDE_DIRS)
+     # Starting in 2020.1.1, tbb_stddef.h is replaced by version.h
+     set(_version_files "${TBB_INCLUDE_DIRS}/tbb/tbb_stddef.h"
+-                       "${TBB_INCLUDE_DIRS}/tbb/version.h")
++                       "${TBB_INCLUDE_DIRS}/tbb/version.h"
++                       "${TBB_INCLUDE_DIRS}/oneapi/tbb/version.h")
+     foreach(f IN ITEMS ${_version_files})
+         if(EXISTS ${f})
+             set(_version_file ${f})
+-- 
+2.43.0
+
diff --git a/dyninst.spec b/dyninst.spec
index 08b3d9a..5eba1e3 100644
--- a/dyninst.spec
+++ b/dyninst.spec
@@ -1,6 +1,6 @@
 Name: dyninst
 License: LGPLv2+
-Release: 4
+Release: 5
 Version: 12.3.0
 Summary: An API for Run-time Code Generation
 ExclusiveArch: x86_64 aarch64
@@ -16,6 +16,7 @@ Source1: https://github.com/dyninst/testsuite/archive/v%{testsuite_version}/%{te
 Patch1: dyninst-eliminate-deprecated-C-function-objects-1331.patch
 Patch2: dyninst-warning-fix-std-iterator-is-deprecated-1394.patch
 Patch3: dyninst-support-clang-build.patch
+Patch4: Fix-FindTBB-version-detection-with-TBB-2021.1.1.patch
 
 BuildRequires: cmake gcc-c++
 BuildRequires: binutils-devel boost-devel
@@ -56,6 +57,7 @@ pushd %{dyninst_base}
 %patch 1 -p1
 %patch 2 -p1
 %patch 3 -p1
+%patch 4 -p1
 popd
 
 sed -i.cotire -e 's/USE_COTIRE true/USE_COTIRE false/' \
@@ -127,6 +129,9 @@ echo "%{_libdir}/dyninst" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf
 %doc %{dyninst_base}/symtabAPI/doc/symtabAPI.pdf
 
 %changelog
+* Thu Jun 20 2024 zhangxianting <zhangxianting@uniontech.com> - 12.3.0-5
+- the file of define tbb version macro has changed at version 2021
+
 * Sat Sep 23 2023 luofeng <luofeng13@huawei.com> - 12.3.0-4
 - support clang build
 
-- 
Gitee