commit e0511022183bc355407a04e615674013c93f2dd2
Author: Jan Palus <[email protected]>
Date: Thu Dec 16 20:28:04 2021 +0100
start upgrade to 12.0.1
still fails to build with recent tbb
dyninst-libname.patch | 10 +++++-----
dyninst-tbb.patch | 10 ++++++++++
dyninst-x32.patch | 2 +-
dyninst.spec | 13 +++++++------
format-size.patch | 40 ----------------------------------------
5 files changed, 23 insertions(+), 52 deletions(-)
---
diff --git a/dyninst.spec b/dyninst.spec
index 8aeac6d..7fd88fe 100644
--- a/dyninst.spec
+++ b/dyninst.spec
@@ -1,29 +1,30 @@
Summary: API for Run-time Code Generation
Summary(pl.UTF-8): API do generowania kodu w czasie działania
Name: dyninst
-Version: 10.1.0
-Release: 6
+Version: 12.0.1
+Release: 0.1
License: LGPL v2.1+
Group: Libraries
#Source0Download: https://github.com/dyninst/dyninst/releases
Source0:
https://github.com/dyninst/dyninst/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 3711fca820ceb8e76d5b026964c5029d
+# Source0-md5: a64cd16ed2c364e892fd46b243414833
Patch0: %{name}-libname.patch
Patch1: %{name}-x32.patch
-Patch2: format-size.patch
+Patch2: %{name}-tbb.patch
URL: https://dyninst.org/dyninst
# libiberty
BuildRequires: binutils-devel
BuildRequires: boost-devel >= 1.61.0
BuildRequires: cmake >= 3.4.0
-BuildRequires: elfutils-devel >= 0.173
+BuildRequires: elfutils-devel >= 0.186
BuildRequires: flex
BuildRequires: libgomp-devel
BuildRequires: libstdc++-devel >= 6:4.7
+BuildRequires: rpmbuild(macros) >= 1.605
BuildRequires: sed >= 4.0
BuildRequires: tbb-devel >= 2018.6
BuildRequires: texlive-format-pdflatex
-Requires: elfutils >= 0.173
+Requires: elfutils >= 0.186
Requires: tbb >= 2018.6
ExclusiveArch: %{ix86} %{x8664} x32 aarch64 ppc ppc64 aarch64
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
diff --git a/dyninst-libname.patch b/dyninst-libname.patch
index 4d619e3..850795d 100644
--- a/dyninst-libname.patch
+++ b/dyninst-libname.patch
@@ -2,10 +2,10 @@ diff -ur dyninst-10.1.0.orig/common/CMakeLists.txt
dyninst-10.1.0/common/CMakeLi
--- dyninst-10.1.0.orig/common/CMakeLists.txt 2019-05-16 20:40:05.000000000
+0200
+++ dyninst-10.1.0/common/CMakeLists.txt 2019-08-28 20:22:16.367000000
+0200
@@ -111,6 +111,7 @@
+ ADD_DEFINITIONS(-DCOMMON_LIB)
-
- dyninst_library(common ${DEPS})
+ dyninst_library(common)
+set_target_properties(common PROPERTIES OUTPUT_NAME dyncommon)
- if(TARGET TBB)
- add_dependencies(common TBB)
- endif()
+
+ if(TARGET LibIberty)
+ add_dependencies(common LibIberty)
diff --git a/dyninst-tbb.patch b/dyninst-tbb.patch
new file mode 100644
index 0000000..8be5467
--- /dev/null
+++ b/dyninst-tbb.patch
@@ -0,0 +1,10 @@
+--- dyninst-12.0.1/cmake/Modules/FindTBB.cmake.orig 2021-11-23
22:48:27.000000000 +0100
++++ dyninst-12.0.1/cmake/Modules/FindTBB.cmake 2021-12-16 20:23:09.983021706
+0100
+@@ -155,6 +155,7 @@
+ set(_version_files
+ "${TBB_INCLUDE_DIRS}/tbb/tbb_stddef.h"
+ "${TBB_INCLUDE_DIRS}/tbb/version.h"
++ "${TBB_INCLUDE_DIRS}/oneapi/tbb/version.h"
+ )
+ foreach(f IN ITEMS ${_version_files})
+ if(EXISTS ${f})
diff --git a/dyninst-x32.patch b/dyninst-x32.patch
index 86ab55c..3c0a873 100644
--- a/dyninst-x32.patch
+++ b/dyninst-x32.patch
@@ -1,7 +1,7 @@
--- DyninstAPI-9.0.3/stackwalk/src/x86-swk.C.orig 2015-08-26
18:13:07.000000000 +0200
+++ DyninstAPI-9.0.3/stackwalk/src/x86-swk.C 2015-10-25 20:25:17.942073210
+0100
@@ -61,7 +61,7 @@
- sw_printf("%p%p\n", frame_pointer, &frame_pointer);
+ sw_printf("%p%p\n", (void*)frame_pointer, (void*)&frame_pointer);
}
-#if defined(arch_x86_64) && (defined(os_linux) || defined(os_freebsd))
diff --git a/format-size.patch b/format-size.patch
deleted file mode 100644
index d0532cd..0000000
--- a/format-size.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- dyninst-10.1.0/instructionAPI/h/Result.h.orig 2019-05-16
20:40:05.000000000 +0200
-+++ dyninst-10.1.0/instructionAPI/h/Result.h 2019-10-24 09:20:07.516588065
+0200
-@@ -449,10 +449,18 @@
- snprintf(hex, 20, "%x", val.s32val);
- break;
- case u64:
-+#if defined(__i386__) || defined(__ILP32__)
-+ snprintf(hex, 20, "%llx", val.u64val);
-+#else
- snprintf(hex, 20, "%lx", val.u64val);
-+#endif
- break;
- case s64:
-+#if defined(__i386__) || defined(__ILP32__)
-+ snprintf(hex, 20, "%llx", val.s64val);
-+#else
- snprintf(hex, 20, "%lx", val.s64val);
-+#endif
- break;
- case sp_float:
- snprintf(hex, 20, "%f", val.floatval);
-@@ -464,10 +472,18 @@
- snprintf(hex, 20, "%x", val.bitval);
- break;
- case u48:
-+#if defined(__i386__) || defined(__ILP32__)
-+ snprintf(hex, 20, "%llx", val.s48val);
-+#else
- snprintf(hex, 20, "%lx", val.s48val);
-+#endif
- break;
- case s48:
-+#if defined(__i386__) || defined(__ILP32__)
-+ snprintf(hex, 20, "%llx", val.s48val);
-+#else
- snprintf(hex, 20, "%lx", val.s48val);
-+#endif
- break;
- case m512:
- snprintf(hex, 20, "%p", val.m512val);
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/dyninst.git/commitdiff/e0511022183bc355407a04e615674013c93f2dd2
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
