commit 49d420e8371e3ca3c72eba483e7c970349f7b09f
Author: Jan Rękorajski <[email protected]>
Date: Thu Oct 24 23:11:04 2019 +0200
- fix format types that break systemtap build on ix86 and x32
- rel 3
dyninst.spec | 4 +++-
format-size.patch | 40 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 43 insertions(+), 1 deletion(-)
---
diff --git a/dyninst.spec b/dyninst.spec
index da11677..46d4464 100644
--- a/dyninst.spec
+++ b/dyninst.spec
@@ -2,7 +2,7 @@ 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: 2
+Release: 3
License: LGPL v2.1+
Group: Libraries
# http://www.dyninst.org/downloads/dyninst-9.x
@@ -11,6 +11,7 @@ Source0:
https://github.com/dyninst/dyninst/archive/v%{version}/%{name}-%{versio
# Source0-md5: 3711fca820ceb8e76d5b026964c5029d
Patch0: %{name}-libname.patch
Patch1: %{name}-x32.patch
+Patch2: format-size.patch
URL: http://www.dyninst.org/dyninst
# libiberty
BuildRequires: binutils-devel
@@ -87,6 +88,7 @@ Dokumentacja do bibliotek dyninst.
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%build
%cmake . \
diff --git a/format-size.patch b/format-size.patch
new file mode 100644
index 0000000..b80e142
--- /dev/null
+++ b/format-size.patch
@@ -0,0 +1,40 @@
+--- 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(arch_x86) || defined(__ILP32__)
++ snprintf(hex, 20, "%llx", val.u64val);
++#else
+ snprintf(hex, 20, "%lx", val.u64val);
++#endif
+ break;
+ case s64:
++#if defined(arch_x86) || 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(arch_x86) || defined(__ILP32__)
++ snprintf(hex, 20, "%llx", val.s48val);
++#else
+ snprintf(hex, 20, "%lx", val.s48val);
++#endif
+ break;
+ case s48:
++#if defined(arch_x86) || 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/49d420e8371e3ca3c72eba483e7c970349f7b09f
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
