SHA256
1
0
forked from pool/varnish

Disable JIT with patch, the define was overridden by pcre.h (bnc#839358)

OBS-URL: https://build.opensuse.org/package/show/server:http/varnish?expand=0&rev=60
This commit is contained in:
Jan Engelhardt 2013-10-04 22:47:06 +00:00 committed by Git OBS Bridge
parent f20657ab31
commit d11bada4ec
2 changed files with 29 additions and 0 deletions

View File

@ -0,0 +1,27 @@
From: Piotr Jankowski <piotr.jankowski@nsn.com>
Date: 2013-09-10 10:55:57 CEST
References: http://bugzilla.novell.com/show_bug.cgi?id=839358
References: https://www.varnish-cache.org/trac/ticket/1191
"The JIT compiler is broken on some versions of PCRE, at least on
i386, so disable it by default."
---
lib/libvarnish/vre.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
Index: varnish-3.0.3/lib/libvarnish/vre.c
===================================================================
--- varnish-3.0.3.orig/lib/libvarnish/vre.c
+++ varnish-3.0.3/lib/libvarnish/vre.c
@@ -40,9 +40,8 @@ struct vre {
pcre_extra *re_extra;
};
-#ifndef PCRE_STUDY_JIT_COMPILE
+#undef PCRE_STUDY_JIT_COMPILE
#define PCRE_STUDY_JIT_COMPILE 0
-#endif
/*
* We don't want to spread or even expose the majority of PCRE options

View File

@ -33,6 +33,7 @@ Source5: varnish.logrotate
Source6: varnishlog.init Source6: varnishlog.init
Source7: varnish.service Source7: varnish.service
Source8: varnishlog.service Source8: varnishlog.service
Patch1: varnish-disable-pcrejit.diff
BuildRoot: %_tmppath/%name-%version-build BuildRoot: %_tmppath/%name-%version-build
BuildRequires: libxslt, ncurses-devel, pcre-devel BuildRequires: libxslt, ncurses-devel, pcre-devel
@ -95,6 +96,7 @@ This package holds the development files for varnish.
%prep %prep
%setup -q %setup -q
%patch -P 1 -p1
%build %build
# bnc#839358: Force-deactivate JIT # bnc#839358: Force-deactivate JIT