diff --git a/varnish.spec b/varnish.spec index dd8fc9c..3c4b894 100644 --- a/varnish.spec +++ b/varnish.spec @@ -17,7 +17,7 @@ Summary: High-performance HTTP accelerator Name: varnish Version: 5.2.1 -Release: 3%{?v_rc}%{?dist} +Release: 4%{?v_rc}%{?dist} License: BSD Group: System Environment/Daemons URL: http://www.varnish-cache.org/ @@ -164,6 +164,9 @@ export RST2MAN=/bin/true %configure --disable-static \ %ifarch aarch64 --with-jemalloc=no \ +%endif +%ifarch x86_64 %arm + --disable-pcre-jit \ %endif --localstatedir=/var/lib \ --docdir=%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} @@ -205,7 +208,7 @@ sed -i "s,\${RPM_BUILD_ROOT}/../../BUILD/varnish\*,%{buildroot}%{_includedir}/%{ %ifarch ppc64 ppc64le aarch64 sed -i 's/48/128/g;' bin/varnishtest/tests/c00057.vtc %endif -#make %{?_smp_mflags} check LD_LIBRARY_PATH="%{buildroot}%{_libdir}:%{buildroot}%{_libdir}/%{name}" VERBOSE=1 +make %{?_smp_mflags} check LD_LIBRARY_PATH="%{buildroot}%{_libdir}:%{buildroot}%{_libdir}/%{name}" VERBOSE=1 %install rm -rf %{buildroot} @@ -403,6 +406,11 @@ fi %endif %changelog +* Thu Dec 21 2017 Ingvar Hagelund - 5.2.1-4 +- Disabled pcre-jit on x86_64 and arm in rawhide for now. It does not + work, and makes other varnish dependant packages crash + (upstream bug #2521) + * Thu Nov 16 2017 Ingvar Hagelund - 5.2.1-3 - Disabled running make check again. Too many timing issues. All tests run successfully on all arches from time to time, but seldom in a single