From 23b8481034407cfd0c387708fd2604bcf3eae3d7 Mon Sep 17 00:00:00 2001 From: "zhongling.h" Date: Fri, 23 Feb 2024 09:17:46 +0000 Subject: [PATCH] rebuild package --- dyninst.spec | 11 ++++++++++- onetbb.patch | 12 ++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 onetbb.patch diff --git a/dyninst.spec b/dyninst.spec index bbf811a..c743efc 100644 --- a/dyninst.spec +++ b/dyninst.spec @@ -1,4 +1,4 @@ -%define anolis_release 2 +%define anolis_release 3 Summary: An API for Run-time Code Generation Name: dyninst @@ -13,6 +13,8 @@ ExclusiveArch: x86_64 aarch64 Source0: https://github.com/dyninst/dyninst/archive/v%{version}/dyninst-%{version}.tar.gz Source1: https://github.com/dyninst/testsuite/archive/v%{version}/testsuite-%{version}.tar.gz +Patch1: onetbb.patch + %global dyninst_base dyninst-%{version} %global testsuite_base testsuite-%{version} @@ -78,6 +80,10 @@ dyninst-doc contains API documentation for the Dyninst libraries. %setup -q -n %{name}-%{version} -c %setup -q -T -D -a 1 +pushd %{dyninst_base} +%patch -P1 -p1 -b .onetbb +popd + # cotire seems to cause non-deterministic gcc errors sed -i.cotire -e 's/USE_COTIRE true/USE_COTIRE false/' \ %{dyninst_base}/cmake/shared.cmake @@ -173,6 +179,9 @@ find %{buildroot}%{_libdir}/dyninst/testsuite/ \ %doc %{dyninst_base}/symtabAPI/doc/symtabAPI.pdf %changelog +* Fri Feb 23 2024 Zhongling He - 12.3.0-3 +- rebuild package + * Thu Apr 13 2023 Kun(llfl) - 12.3.0-2 - optimize spec file diff --git a/onetbb.patch b/onetbb.patch new file mode 100644 index 0000000..98eae26 --- /dev/null +++ b/onetbb.patch @@ -0,0 +1,12 @@ +--- dyninst-12.2.0/cmake/Modules/FindTBB.cmake~ 2023-06-27 22:52:25.396598265 +0100 ++++ dyninst-12.2.0/cmake/Modules/FindTBB.cmake 2023-06-27 22:52:27.776601825 +0100 +@@ -154,7 +154,8 @@ + 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}) -- Gitee