[R-qtl/el5] Remove stack limit workaround (bug fixed in R 3.1.1)
Mattias Ellert
ellert at fedoraproject.org
Thu Jul 17 02:12:18 UTC 2014
commit 1ba839d3d5d586087e1ecd7deb4273bf813093fe
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Thu Jul 17 04:11:55 2014 +0200
Remove stack limit workaround (bug fixed in R 3.1.1)
R-qtl.spec | 16 +++++++---------
1 files changed, 7 insertions(+), 9 deletions(-)
---
diff --git a/R-qtl.spec b/R-qtl.spec
index 8ca7dba..5f4a294 100644
--- a/R-qtl.spec
+++ b/R-qtl.spec
@@ -2,14 +2,16 @@
Name: R-%{packname}
Version: 1.32.10
-Release: 3%{?dist}
+Release: 4%{?dist}
Source0: http://www.rqtl.org/download/%{packname}_1.32-10.tar.gz
License: GPLv3
URL: http://www.rqtl.org/
Group: Applications/Engineering
Summary: Tools for analyzing QTL experiments
Requires: R-core
-BuildRequires: R-core-devel
+# R versions before 3.1.1 have a bug that causes the checks
+# to fail on 64 bit big endian architectures (ppc64, s390x)
+BuildRequires: R-core-devel >= 3.1.1
BuildRequires: tex(latex)
%if %{?fedora}%{!?fedora:0} >= 18 || %{?rhel}%{!?rhel:0} >= 7
BuildRequires: tex(fullpage.sty)
@@ -53,13 +55,6 @@ rm -rf %{buildroot}%{_libdir}/R/library/R.css
rm -rf %{buildroot}%{_libdir}/R/library/%{packname}/contrib
%check
-# Check fails on ppc64 and s390x with
-# Error: C stack usage is too close to the limit
-# stack limit set to hard limit allow tests to pass
-%ifarch ppc64 ppc64le s390x
-ulimit -Ss hard
-%endif
-
R CMD check %{packname}
%clean
@@ -89,6 +84,9 @@ rm -rf %{buildroot}
%{_libdir}/R/library/%{packname}/sampledata
%changelog
+* Thu Jul 17 2014 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.32.10-4
+- Remove stack limit workaround (bug fixed in R 3.1.1)
+
* Tue Jul 01 2014 Jakub Čajka <jcajka at redhat.com> - 1.32.10-3
- Changed stack limit on ppc64 and s390x to allow checks to pass
More information about the scm-commits
mailing list