[pcre] fix build on s390(x) - disable jit and use larger stack for tests

Dan Horák sharkcz at fedoraproject.org
Tue Nov 15 14:24:16 UTC 2011


commit dfafe2bb2559c494c1055caa73c81403396f231c
Author: Dan Horák <dan at danny.cz>
Date:   Tue Nov 15 15:24:10 2011 +0100

    fix build on s390(x) - disable jit and use larger stack for tests

 pcre.spec |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)
---
diff --git a/pcre.spec b/pcre.spec
index 7f8d82d..4c4f71a 100644
--- a/pcre.spec
+++ b/pcre.spec
@@ -1,7 +1,7 @@
 # This is stable release: %%global rcversion RC3
 Name: pcre
 Version: 8.20
-Release: %{?rcversion:0.}1%{?rcversion:.%rcversion}%{?dist}
+Release: %{?rcversion:0.}2%{?rcversion:.%rcversion}%{?dist}
 %global myversion %{version}%{?rcversion:-%rcversion}
 Summary: Perl-compatible regular expression library
 Group: System Environment/Libraries
@@ -59,8 +59,13 @@ for F in ChangeLog; do
 done
 
 %build
-%configure --enable-jit --enable-pcretest-libreadline --enable-utf8 \
-    --enable-unicode-properties
+%configure \
+%ifarch s390 s390x
+    --disable-jit \
+%else
+    --enable-jit \
+%endif
+    --enable-pcretest-libreadline --enable-utf8 --enable-unicode-properties
 make %{?_smp_mflags}
 
 %install
@@ -80,6 +85,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -rf $RPM_BUILD_ROOT%{_docdir}/pcre
 
 %check
+%ifarch s390
+# larger stack is needed on s390
+ulimit -s 10240
+%endif
 make check
 
 %post -p /sbin/ldconfig
@@ -112,6 +121,9 @@ make check
 %{_mandir}/man1/pcretest.*
 
 %changelog
+* Tue Nov 15 2011 Dan Horák <dan[at]danny.cz> - 8.20-2
+- fix build on s390(x) - disable jit and use larger stack for tests
+
 * Fri Oct 21 2011 Petr Pisar <ppisar at redhat.com> - 8.20-1
 - 8.20 bump
 


More information about the scm-commits mailing list