Attachment 919870 Details for Bug 1122009 – Patch fixing both issues

[patch] Patch fixing both issues

0001-Fixed-build-on-s390-x-and-AArch64.patch (text/plain), 2.26 KB, created by Jakub Čajka on 2014-07-22 10:55:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jakub Čajka

Created: 2014-07-22 10:55:12 UTC

Size: 2.26 KB

patch

obsolete

>From b7d3aa7a7ffd1bd197818372e0b9de7a61424337 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Jakub=20=C4=8Cajka?= <jcajka@redhat.com>
>Date: Tue, 22 Jul 2014 12:49:31 +0200
>Subject: [PATCH] Fixed build on s390(x) and AArch64 Defined missing rpm macro
> for F20<
>
>---
> secarch.patch | 14 ++++++++++++++
> tiptop.spec   | 15 ++++++++++++++-
> 2 files changed, 28 insertions(+), 1 deletion(-)
> create mode 100644 secarch.patch
>
>diff --git a/secarch.patch b/secarch.patch
>new file mode 100644
>index 0000000..3eeaebb
>--- /dev/null
>+++ b/secarch.patch
>@@ -0,0 +1,14 @@
>+diff -up tiptop-2.2/src/pmc.c.secarch tiptop-2.2/src/pmc.c
>+--- tiptop-2.2/src/pmc.c.secarch	2013-02-28 14:44:24.000000000 +0100
>++++ tiptop-2.2/src/pmc.c	2014-07-21 11:31:24.470041854 +0200
>+@@ -28,6 +28,10 @@
>+ #define __NR_perf_counter_open	336
>+ #elif defined(TARGET_SPARC)
>+ #define __NR_perf_counter_open  327
>++#elif defined(__s390x__) || defined(__s390__)
>++#define __NR_perf_counter_open  331
>++#elif defined(__aarch64__)
>++#define __NR_perf_counter_open  241
>+ #endif
>+ 
>+ long sys_perf_counter_open(struct STRUCT_NAME *hw_event,
>diff --git a/tiptop.spec b/tiptop.spec
>index dc05509..ef62e73 100644
>--- a/tiptop.spec
>+++ b/tiptop.spec
>@@ -1,6 +1,11 @@
>+# make_build is not defined in fedora 20<
>+%if 0%{?fedora} < 21
>+%define make_build %{__make} %{?_smp_mflags}
>+%endif
>+
> Name:           tiptop
> Version:        2.2
>-Release:        1%{?dist}
>+Release:        2%{?dist}
> Summary:        Performance monitoring tool based on hardware counters
> License:        GPLv2
> URL:            http://tiptop.gforge.inria.fr/
>@@ -10,6 +15,8 @@ BuildRequires:  flex
> BuildRequires:  libxml2-devel
> BuildRequires:  ncurses-devel
> 
>+Patch0: secarch.patch
>+
> %description
> Hardware performance monitoring counters have recently received a lot of 
> attention. They have been used by diverse communities to understand and 
>@@ -32,6 +39,8 @@ counters.
> 
> %prep
> %setup -q
>+#Adds missing constants for s390(x) and AArch64
>+%patch0 -p1 -b .secarch
> 
> %build
> %configure
>@@ -46,6 +55,10 @@ counters.
> %{_mandir}/man1/tiptop.1*
> 
> %changelog
>+* Mon Jul 21 2014 Jakub Äajka <jcajka@redhat.com> - 2.2-2
>+- Fixed build on s390(x) and AArch64
>+- Defined missing rpm macro for F20<
>+
> * Wed Jul 16 2014 Christopher Meng <rpm@cicku.me> - 2.2-1
> - Update to 2.2
> 
>-- 
>1.9.3
>

Actions: View | Diff

Attachments on bug 1122009: 919870