[filebench] Fix FTBFS on ARM (RHBZ 923468)
Peter Robinson
pbrobinson at fedoraproject.org
Tue Mar 19 23:40:13 UTC 2013
commit e973eec3162d9b9b449649d15d3ce77d14b20d52
Author: Peter Robinson <pbrobinson at gmail.com>
Date: Tue Mar 19 23:40:07 2013 +0000
Fix FTBFS on ARM (RHBZ 923468)
filebench-arm.patch | 14 ++++++++++++++
filebench.spec | 13 ++++++-------
2 files changed, 20 insertions(+), 7 deletions(-)
---
diff --git a/filebench-arm.patch b/filebench-arm.patch
new file mode 100644
index 0000000..9225c47
--- /dev/null
+++ b/filebench-arm.patch
@@ -0,0 +1,14 @@
+--- filebench-1.4.9/ioprio.c 2013-03-19 19:01:21.816372293 -0400
++++ filebench-1.4.9/ioprio.c 2013-03-19 17:42:08.722552003 -0400
+@@ -16,6 +16,11 @@
+ #elif defined(__s390__) || defined(__s390x__)
+ #define __NR_ioprio_set 282
+ #define __NR_ioprio_get 283
++#elif defined(__arm__)
++#ifndef __NR_ioprio_set
++#define __NR_ioprio_set 314
++#define __NR_ioprio_get 315
++#endif
+ #else
+ #error "Unsupported arch"
+ #endif
diff --git a/filebench.spec b/filebench.spec
index 0f11d65..2ed7ff0 100644
--- a/filebench.spec
+++ b/filebench.spec
@@ -1,6 +1,6 @@
Name: filebench
Version: 1.4.9
-Release: 10%{?dist}
+Release: 11%{?dist}
Summary: A model based file system workload generator
Group: Applications/File
@@ -12,7 +12,7 @@ Source2: filebench.1
# fix build on secondary arches
Patch0: filebench-1.4.9-secondary.patch
Patch1: make-dofile-global.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch2: filebench-arm.patch
BuildRequires: flex
BuildRequires: bison
@@ -27,6 +27,7 @@ for detailed workload specification.
%setup -q
%patch0 -p1 -b .secondary
%patch1 -p1
+%patch2 -p1 -b .arm
cp -p %{SOURCE1} .
cp -p %{SOURCE2} .
@@ -37,16 +38,11 @@ make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
%install
-rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
install -m 644 -p %{SOURCE2} $RPM_BUILD_ROOT%{_mandir}/man1
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
%files
%doc AUTHORS ChangeLog COPYING LICENSE NEWS README TODO
%{_bindir}/%{name}
@@ -55,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Mar 19 2013 Peter Robinson <pbrobinson at fedoraproject.org> 1.4.9-11
+- Fix FTBFS on ARM (RHBZ 923468)
+
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.9-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
More information about the scm-commits
mailing list