packages/dyninst
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!41 [sync] PR-33: the file of define tbb version macro has changed at version 2021

Browse Source 
From: @openeuler-sync-bot 
Reviewed-by: @SuperSix173 
Signed-off-by: @SuperSix173
This commit is contained in:
openeuler-ci-bot 2024-11-12 02:53:42 +00:00 committed by Gitee
commit 3624a5e000
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Fix-FindTBB-version-detection-with-TBB-2021.1.1.patch Normal file
View File

@ -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

7
dyninst.spec
View File

@ -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